[*] BO : More coherent labels (and some typos) in admin controllers.
Merge branch '1.6' of https://github.com/xBorderie/PrestaShop into xBorderie-1.6

Conflicts:
	controllers/admin/AdminReferrersController.php