Merge pull request #10 from perselab/master

Add product sku price to ProductMarketingViewBean
more about category / product marketing / sku
Add more about checkout process

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/web/mvc/viewbean/CategoryViewBean.java
add delivery method + payment gateway option
Add related products
Merge remote branch 'upstream/master'

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