//fixed bug #PSCSX-291 && dashboard configuration save
//fixed bug #PSCSX-291 part2
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6