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
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
updating poms for 1.0.0-SM19-SNAPSHOT development
updating poms for branch'release/1.0.0-SM18' with non-snapshot versions
Fix poms
Merge branch 'release/1.0.0-SM18'

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
Fix unit test for ldap
Fix poms as it seems that the jgit-flow release plugin failed to really create valid ones..
Merge branch 'release/1.0.0-SM18' into develop

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