clean DAO + small fix
Merge branch 'master' of
https://github.com/qalingo/qalingo-b2c-engine.git

Conflicts:
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java
fix price
clean & fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/dao/impl/ProductBrandDaoImpl.java