a l'ancienne
Merge branch 'master' of https://github.com:443/capabilitiesOnMobile/COM

Conflicts:
	MultiPageApp/apps/MultiPageApp/common/pages/Industries/SmarterCities/SmartWaterIntegrationForReducedLeakage.html
	MultiPageApp/bin/MultiPageApp-common.wlapp