commit before merge
Merge remote-tracking branch 'origin/roland' into alex

Conflicts:
	domino/externals/tinkerpop/pom.xml
	domino/xsp/META-INF/MANIFEST.MF