wip
Merge branch 'master' of ssh://git@github.com/evandor/skysail-server.git

Conflicts:
	skysail.server/src/main/java/de/twenty11/skysail/server/core/restlet/ListServerResource.java
	skysail.server/src/main/java/de/twenty11/skysail/server/core/restlet/ResourceFilter.java