// Fields resizing
// notice
//Starting Uploader helper
// Some changes to integrate uploader helper
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	controllers/admin/AdminCategoriesController.php
// Fix on color field in list
// Fix merge
// small fix on multishop checkboxes
// new design for referralprogram mails template
// fix login - (tabindex, loading, ellipsis)
// class_index
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// news design sendtoafriend mails template
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into moulinex