Update localised strings (wip)
Merge branch 'hotfix/1.3.10'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #3 from PrestaShop/develop

Fixes to bugs reported by prestashop during first review stage
Merge branch 'develop' into feature/localization-updates
Update translation files
Update translation files
Merge pull request #5 from PrestaShop/develop

fix iframe preview url and some refactoring
Merge branch 'release/1.3.6'
Merge branch 'release/1.3.6'
Merge branch 'release/1.3.7'
Make sure the ctrl.php script an only run oath, product and order controllers
Merge commit 'f8ffa653aa5aa598c5d399242795510e112450db' into develop
Merge branch 'develop' into feature/localization-updates
Update translations
Merge branch 'feature/localization-updates' into develop
Bump version to 2.0
Merge branch 'release/2.0.0' into develop