wip
Merge branch 'develop' of https://github.com/evandor/skysail.git into
develop

Conflicts:
	skysail.products.incubator/launchers/derby.log
	skysail.products.incubator/launchers/logs/debug.log
	skysail.products.incubator/launchers/logs/info.log
	skysail.server.app.incubator/src/de/twenty11/skysail/server/app/incubator/applications/Application.java
	skysail.server/src/de/twenty11/skysail/server/core/restlet/converter/BootstrapHtmlConverter.java
	skysail.server/src/de/twenty11/skysail/server/core/restlet/converter/internal/JsTreeContentStrategy.java
cleanup
cleanup
cleanup
wip