Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh

templates/admin/default/includes/confirmation-modal.html

@@ -0,0 +1,32 @@
+{*
+    Params
+    - id : aside element id (default delete)
+    - title : modal title (default Confirmation)
+    - message : modal message (default Do you really want to delete this element ?)
+*}
+{block name="confirmation-modal"}
+<aside id="{if $id}$id{else}delete{/if}" class="modal hide fade" role="dialog">
+    <div class="modal-header">
+        <h3>
+            {if $title}
+                $title
+            {else}
+                {intl l='Confirmation'}
+            {/if}
+        </h3>
+    </div>
+    <div class="modal-body">
+        <p>
+        {if $message}
+            $message
+        {else}
+            {intl l='Do you really want to delete this element ?'}
+        {/if}
+        </p>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-inverse" data-dismiss="modal">{intl l='Cancel'}</button>
+        <a href="#" class="btn btn-success" data-confirm="confirm">{intl l='Confirm'}</a>
+    </div>
+</aside> <!-- #delete / Delete confirmation -->
+{/block}