Merge branch 'master' of https://github.com/nkphuong/qalingo-b2c-engine into nkphuong-master

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