// small fixs
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl
// Unify form fields for image preferences
// move clear cache of color list
// list bulk actions fix
// add date change trigger
// New profitability calculation
// Typo
// Add date subtitle
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Date range picker fix
// Fix products form content
// Shortcuts for chart selection
// Comparison is optionnal
//helper list must be wrapped by a form even if it's a simple header
// Refine dashboard net profits
// Add link to profitability conf
// forgot to rename a field
// update mail templates
// Fix hook list problem on multishop