Merging
Merge branch 'master' of https://github.com/tuwiendsg/DaaSM2M

Conflicts:
	Components/DaaSWebClient/src/main/java/at/ac/tuwien/dsg/daas/impl/CassandraManagementAPI.java