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/coupon-create.html

@@ -0,0 +1,41 @@
+{extends file="admin-layout.tpl"}
+{block name="check-permissions"}admin.coupon.create{/block}
+{block name="page-title"}{intl l='Create coupon'}{/block}
+
+{block name="main-content"}
+<section id="wrapper" class="container">
+
+    <nav>
+        <ul class="breadcrumb">
+            {include file="includes/coupon_breadcrumb.html"}
+        </ul>
+    </nav>
+
+    <div class="page-header">
+        <h1>Coupons : <small>Add a coupon</small></h1>
+    </div>
+
+    {form name="thelia.admin.coupon.creation"}
+    {include file='coupon/form.html' formAction={url path={$formAction}}}
+    {/form}
+
+</section> <!-- #wrapper -->
+{/block}
+
+{include file='includes/confirmation-modal.html'}
+
+{block name="javascript-initialization"}
+    {javascripts file='assets/bootstrap-datepicker/js/bootstrap-datepicker.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
+    <script>
+        $(function($){
+            miniBrowser(0, '/test_to_remove/datas_coupon_edit.json');
+        });
+    </script>
+{/block}