// removed load of jquery.cluetip from adminController ( and use bootstrap tooltips instead)
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	classes/controller/AdminController.php
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6