fixes return type annotation
fixes #52
Merge branch 'master' into 52

Conflicts:
	src/main/java/de/cinovo/cloudconductor/server/ServerStarter.java
Merge pull request #53 from cinovo/52

see ticket #52