// Warning / var not set
// Improved module installation for single column templates
//added clearfix for gamification advices
[*] MO : statsdata updated
[*] BO : fixed some css issues + recommended modules modal
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	admin-dev/themes/default/template/helpers/form/form.tpl
// collapse menu
// notice
// blocklayered - Fix unwanted products on non selected categories
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[*] BO : fix growl notification
// small fix
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Fixed bad functino name
[*] FO : generate product and category images in the right format on the fly when 404