Merge branch 'master' of https://github.com/Wuggles/MobielCase
Merge branch 'master' of https://github.com/Wuggles/MobielCase

Conflicts:
	Model/target/classes/META-INF/maven/com.infosupport/Model/pom.properties