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/notifications.html

@@ -0,0 +1,11 @@
+{*
+    Params
+    - type : notification type (default alert)
+    - message : modal message
+*}
+{if $message}
+<div class="{if $type}$type{else}alert alert-info{/if}">
+    <span class="icon-question-sign"></span>
+    {$message}
+</div>
+{/if}