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

Conflicts:
	skysail.server.ext.notes/src/de/twenty11/skysail/server/ext/notes/NotesApplication.java
	skysail.server/etc/testrun.log
Merge branch 'master' of https://github.com/evandor/skysail.git
sonar fix
wip
Merge branch 'master' of https://github.com/evandor/skysail.git

Conflicts:
	skysail.config.configadmin/.settings/org.sonar.ide.eclipse.core.prefs