comit to merge
Merge remote branch 'upstream/master'

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/content/store-location/store-location-footer.vm
Merge remote branch 'upstream/master'
add js render + add icon marker
add js render + add icon marker
add event click store item
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/content/store-location/store-location-footer.vm
add css + fix html popup
Merge pull request #15 from baotran109/master

add css + fix html popup
Fix Store-Locator map popup
Merge branch 'master' of https://github.com/perselab/qalingo-b2c-web-classic-fo-bo

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-resources/src/main/resources/themes/default/css/main.css
fix css store
Merge pull request #16 from baotran109/master

fix css page store
Merge pull request #15 from perselab/master

Fix map-store css