create new smarty function for displaying date in expected format
complete test for format_date smarty function
add some phpdoc
remove sqlmap file
create foramt_number smarty function
test foramt_date without datetime object
complete test for foramt_number smarty function
fix typo in phpdoc
Merge branch 'coupon' of https://github.com/thelia/thelia into coupon

# By mespeche
# Via mespeche
* 'coupon' of https://github.com/thelia/thelia:
  Working
  Working
  WIP
  WIP
  Working
  Working
  Working
  WIP
  WIP
  Working
  WIP
  WIP
  Working
WIP
- Coupon create
Smarty inheritance in admin template.
Merge branch 'master' of https://github.com/thelia/thelia
en_EN -> en_UK, the "en_EN" locale does not exists.
Merge branch 'coupon' of https://github.com/thelia/thelia into coupon

# By mespeche
# Via mespeche
* 'coupon' of https://github.com/thelia/thelia:
  Max usage field and Is enabled field updates
  Max usage gestion
WIP
- Coupon create
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