// Word change in AdminDashboard.
Merge branch 'patch-1' of https://github.com/xBorderie/PrestaShop into xBorderie-patch-1

Conflicts:
	controllers/admin/AdminDashboardController.php