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

Conflicts:
	domino/externals/tinkerpop/pom.xml
	domino/xsp/META-INF/MANIFEST.MF
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
Merge remote-tracking branch 'origin/roland' into alex

Conflicts:
	domino/xsp/src/org/openntf/domino/xsp/xots/XotsDominoRunner.java
Merge remote-tracking branch 'origin/roland' into manfred

Conflicts:
	domino/xsp/src/org/openntf/domino/xsp/xots/XotsDominoRunner.java
Merge remote-tracking branch 'origin/roland' into manfred
Deleted dead source
Repaired sessions
Improved output to console. (writing with native method. That omits "HTTP JVM" prefix)
Merge remote-tracking branch 'origin/alex' into roland

Conflicts:
	domino/core/src/org/openntf/domino/xots/XotsDaemon.java
	domino/xsp/src/org/openntf/domino/xsp/xots/XotsDominoExecutor.java
Reworked the mehods that reads application properties. XotsDaemon Class name will change to Xots now (old XotsDaemon left for compatibility)
Merge remote-tracking branch 'origin/manfred' into roland
Replaced some deprecated code
XOTS with session passing should work now, you can start your tasklet from serverconsole:
tell http osgi xots run <dbpath> <tasklet-class> [<parameter for constructor>]