Merge branch 'develop' of https://github.com/BlackScorp/StudOS into develop

Conflicts:
	features/bootstrap/FeatureContext.php
	features/listGroupTypes.feature
	src/StudOS/Core/Entity/GroupType.php
	src/StudOS/Core/Value/Type.php
fixes
Merge branch 'develop' of https://github.com/BlackScorp/StudOS into develop

Conflicts:
	features/bootstrap/FeatureContext.php