update
update
Merge branch 'origin/master'

Conflicts:
	MavenWebApp_MongoDB/target/m2e-wtp/web-resources/META-INF/maven/MavenWebApp_MongoDB/MavenWebApp_MongoDB/pom.properties