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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/web/mvc/viewbean/CategoryViewBean.java