//small fix on cache_id in classe Hook
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
//display date on dashproducts && added param date_from & date_to on dashboard hooks
// update mail templates
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into moulinex
// Fix Combinations ajax problem
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into moulinex