oo
Merge remote-tracking branch 'origin/master'u

Conflicts:
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF