merge from perselab
Merge remote branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/domain/CatalogCategoryVirtual.java
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java
cart + Bread cumb
Merge pull request #5 from baotran109/master

List cart + Bread cumb
breadcum
Merge pull request #6 from baotran109/master

breadcum
Fixed ProductLine view features
Merge branch 'master' of https://github.com/nkphuong/qalingo-b2c-engine into nkphuong-master

Conflicts:
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java
update product-line
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductDetailsController.java
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java