Merge remote-tracking branch 'origin/master'

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

	target/m2e-wtp/web-resources/META-INF/maven/maniacgroup.website/rujigames/pom.properties