Silly POM files...
Merge branch 'master' of https://github.com/JoranBergfeld/ProjectVirt_Group08

Conflicts:
	Rest Service/Virt_RestService/target/m2e-wtp/web-resources/META-INF/maven/Virt_RestService/Virt_RestService/pom.properties