commit 11/10/2013
Merge branch 'master' of https://github.com/CELAR/cloud-ms.git

Conflicts:
	JCatascopia-Agent/target/classes/META-INF/maven/eu.celarcloud.cloud-ms/JCatascopia-Agent/pom.properties
commit 11/10/2013b