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