Merge pull request #12 from perselab/master

Update Product Axe/Line/Details
improve taxe and price + refactoring
Merge branch 'master' of
https://github.com/qalingo/qalingo-b2c-engine.git

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/ModelConstants.java
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/impl/ViewBeanFactoryImpl.java
clean and fix previous merge
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
Fix merged
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