Merge origin/master

Conflicts:
	resources/META-INF/MANIFEST.MF