refs #11
fixes #15
refs #11
refs #11
Merge branch 'master' into #11
fixes failing tests
disables travis build of branches
updates
fixes #16
refs #16 fixed failure on template creation
Merge branch 'master' into #13

Conflicts:
	cloudconductor/src/main/java/de/cinovo/cloudconductor/server/impl/rest/AgentImpl.java
	cloudconductor/src/main/java/de/cinovo/cloudconductor/server/model/tools/AMConverter.java
refs #13