Merge remote-tracking branch 'origin/alex' into manfred
Commit before Merge
Merge remote-tracking branch 'origin/development' into manfred

Conflicts:
	org.openntf.domino.plugin/.classpath
	org.openntf.domino.plugin/.project
	org.openntf.domino.plugin/build.properties
First correction