//added configuration in sql request in dashactivity
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap