fixing PROBCORE-283
Merge branch 'develop' of github.com:bendisposto/prob2 into develop

Conflicts:
	de.prob.core.rodin/META-INF/MANIFEST.MF