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

Conflicts:
	skysail.server.app.incubator/src/de/twenty11/skysail/server/app/incubator/applications/ApplicationDto.java
	skysail.server.app.incubator/src/de/twenty11/skysail/server/app/incubator/utils/ApplicationCreationHelper.java
incubator wip