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/assets/css/admin.less

@@ -629,6 +629,10 @@ form .info .input-append .add-on {
     .actions {
         text-align: right;
     }
+
+    .form {
+        margin-bottom: 0;
+    }
 }
 
 // Reduce bottom margin of admin tabs.