sort + pagination product line
fix order by product
Merge pull request #4 from baotran109/master

sort + pagination product line
Merge branch 'master' of https://github.com/perselab/qalingo-b2c-web-classic-fo-bo

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/content/catalog/product-line.vm
fix sort + order by
fix closed tag of button
Merge branch 'master' of https://github.com/baotran109/qalingo-b2c-web-classic-fo-bo into baotran109-master

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/content/catalog/product-line.vm
update product-line.vm
Merge pull request #6 from nkphuong/master

update product-line.vm
Add common ProductBrands to ProductLine & ProductAxe
merge from perselab
Merge remote branch 'upstream/master'
cart + Bread cumb
Merge pull request #7 from baotran109/master

List cart + Bread cumb
Merge pull request #8 from perselab/master

Update Product Axe/Line/Details