// small fixes
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] MO : blockcms : fix add button missing
Merge remote-tracking branch 'origin/1.6' into 1.6
[-] FO: Color selector when not color attribute

If you define a attribute as a color and define some attributes with colors, if you change the attribute type the color selector stills appears.
Merge pull request #1227 from joseantgv/patch-2

[-] FO: Color selector when not color attribute
// AdminThemes fix default value for left and right_column
//fixed page_header_toolbar when configure module
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Code cleaning
[*] Core : MAJ Archive_Tar
// Cleaned Archive Tar calls
fixed product hover
Merge pull request #1228 from TMMeilleur/1.6

fixed product hover
// 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