Entities bijgewerkt
Groepen hernoemt naar Rollen (Roles)
remains
Overig
test
Merge branch 'Demo' of https://github.com/rvhelden/ITopia into Demo

Conflicts:
	FIS/src/Classes/Controllers/SubscriptionsController.java
	FIS/src/Classes/Controllers/UsersController.java
	FIS/src/Classes/Helpers/Entities/UserEntityHelper.java
	FIS/src/Entities/UserEntity.java