Update Product-Aex

Conflicts:
	qalingo-theme-assets/qalingo-assets-frontoffice/qalingo-assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/content/catalog/product-axe.vm

Add product-line view layout
Product Line View
Product Line View
Merge pull request #1 from nkphuong/master

Product Line View
Merge remote-tracking branch 'upstream/master'
Fetch from upstream
Merge branch 'master' of https://github.com/perselab/qalingo-b2c-web-classic-fo-bo

Conflicts:
	theme-assets/assets-backoffice/assets-reporting-pages/src/main/resources/velocity/themes/default/www/default/_include/body-header.vm
	theme-assets/assets-frontoffice/assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/content/catalog/product-line.vm
commit product-details
Merge remote branch 'upstream/master'
add url details product
Merge pull request #2 from baotran109/master

add product url
Merge remote-tracking branch 'upstream/master'
Update ProductDetails (partial)
update product-line (partial)
Merge pull request #3 from baotran109/master

update product-line (partial)
Merge pull request #6 from perselab/master

Update Views