merge from perselab
Merge remote branch 'upstream/master'
Fix merged
merge from perselab
Merge remote branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/dao/ProductDao.java
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/service/impl/ProductServiceImpl.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 remote-tracking branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/dao/impl/ProductBrandDaoImpl.java
Merge remote branch 'upstream/master'
merge from perselab
Fixed merge
fix breadcrumb + catalogCategoryRootLis i18n
Merge pull request #9 from baotran109/master

fix breadcrumb + catalogCategoryRootLis i18n
Merge pull request #14 from perselab/master

Fix merged