Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
comit for merge
Merge remote branch 'upstream/master'

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-resources/src/main/resources/themes/default/plugins/qalingo-plugin.form-cart.js
Merge remote-tracking branch 'upstream/master'
Merge remote branch 'upstream/master'
merge from perselab
add gird + store location
search + slider store
Merge pull request #12 from baotran109/master

add mode list  ProductLineController + page store location + css
Merge pull request #12 from perselab/master

Update StoreLocator layout, ProductLine list view