//configuration PS_VERSION_DB is now automaticaly set during install
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6