Even vorige commit gefixed
Member general info scherm gemaakt
Member general info scherm gemaakt
Member general info scherm gemaakt
Merge branch 'master' of https://github.com/rvhelden/ITopia

Conflicts:
	FIS/nbproject/UPDATED.TXT
	FIS/src/Classes/Controllers/UserSubscriptionController.java

forced push
clean up