[*] BO: use Translate::getAdminTranslation instead of translate()
// Add translate() as deprecated
Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate

Conflicts:
	admin-dev/header.inc.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'PrestaEdit-translate' into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development