updating poms for branch '0.0.15' with snapshot versions
updating poms for branch'release/0.0.15' with non-snapshot versions
updating poms for branch'release/0.0.16' with non-snapshot versions
Merge branch 'release/0.0.16'

Conflicts:
	alien4cloud-common/pom.xml
	alien4cloud-core/pom.xml
	alien4cloud-mock-paas-provider-plugin/pom.xml
	alien4cloud-rest-api/pom.xml
	alien4cloud-rest-it/pom.xml
	alien4cloud-security/pom.xml
	alien4cloud-ui/pom.xml
	alien4cloud-verify-tool/pom.xml
	pom.xml
Move mapping to yaml rather than java files.
Work on mapping.
updating poms for branch '1.0.0-M3' with snapshot versions
updating poms for branch'release/1.0.0-M3' with non-snapshot versions
Merge branch 'release/1.0.0-M3'

Conflicts:
	alien4cloud-common/pom.xml
	alien4cloud-core/pom.xml
	alien4cloud-mock-paas-provider-plugin/pom.xml
	alien4cloud-rest-api/pom.xml
	alien4cloud-rest-it/pom.xml
	alien4cloud-security/pom.xml
	alien4cloud-ui/pom.xml
	alien4cloud-verify-tool/pom.xml
	pom.xml
ALIEN-538 : As a USER I want to be able to use Cloudify 3 as a cloud deployer.
ALIEN-538 : As a USER I want to be able to use Cloudify 3 as a cloud deployer.
Merge remote-tracking branch 'origin/develop' into develop-vuminhkh
missing trad
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop
ALIEN-538 : As a USER I want to be able to use Cloudify 3 as a cloud deployer.
Merge remote-tracking branch 'origin/develop' into develop-vuminhkh
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop
Merge remote-tracking branch 'origin/develop' into develop-vuminhkh
On going work on mapping improvements
Commit to merge with the develop