comit for merge
Merge remote branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common-web-fo/src/main/java/org/hoteia/qalingo/core/dozer/DeliveryMethodCustomBeanFactory.java
	apis/api-core/api-core-common-web-fo/src/main/java/org/hoteia/qalingo/core/web/mvc/controller/common/ContextController.java
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/common/StoreLocationController.java
Merge remote branch 'upstream/master'
merge from perselab
add mode list
Merge pull request #11 from baotran109/master

fix function buildStoreLocatorFilterBean