[-] BO: Standard Norm
Merge pull request #190 from PrestaEdit/patch-13

[-] BO: Standard Norm
Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development