Merge pull request #14 from perselab/master

Update Store-locator, Search-Result page
add wording input search
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