Bugs fixed for version 2
Merge branch 'feature2.0_fix01' of https://github.com/twengahub/PrestaShop-modules into feature2.0_fix01