some more stle ;)
Merge branch 'master' of https://github.com/zakdariusz/prestashop