breadcum
Merge pull request #6 from baotran109/master

breadcum
Fixed ProductLine view features
recent product
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
fix i18nName
Merge pull request #8 from nkphuong/master

fix i18nName
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common-web-fo/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/impl/FrontofficeViewBeanFactoryImpl.java
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/ViewBeanFactory.java
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/impl/ViewBeanFactoryImpl.java
Merge branch 'master' of https://github.com/perselab/qalingo-b2c-engine

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/impl/ViewBeanFactoryImpl.java
Merge pull request #13 from perselab/master

Complete ProductAxe/Line/Details