[-] FO : Fix bug #PSCSX-25 again, do not display voucher for free shipping from cart rule
Test
// Fixs on responsive nav
//configuration PS_VERSION_DB is now automaticaly set during install
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// check a new env variable to detect if SSL is enable
[-] BO : FixBug #PSCSX-526 Product combination design
// helperlist small fix + change icon-ok to icon-check
// move onchange to order-carrier.js
// remove data-js =(
[-] Core: fix price validator
// duplicate id id_product_comment_send
// followup https://github.com/PrestaShop/PrestaShop/pull/1314
// Ajaxfilemanager dir change
// Fix page header toolbar problem
[-] FO : Fix bug #PSCSX-547 no more resizeAddressesBox
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[*] BO: typos ("cant") in AdminThemes.
// fix navs