fix vm contact + product-axe + prehome
Merge remote-tracking branch 'upstream/master'
Merge pull request #26 from perselab/master

To fix the broken Layout
fix js resource
Merge branch 'master' of https://github.com/qalingo/qalingo-b2c-web-classic-fo-bo.git
Fix wrong resources path
Merge remote-tracking branch 'upstream/master'
Merge remote branch 'upstream/master'

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-resources/src/main/resources/themes/default/js/page.store-locator.js