working version
working version
Merge branch 'master' of
https://github.com/MBPS-Project/mbps-shared-ressources.git

Conflicts:
	mbps-shared-resources/pom.xml
	mbps-shared-resources/src/main/java/ch/uzh/csg/mbps/responseobject/CustomResponseObject.java