add & remove Enrollment
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/target/classes/messages.properties
	JavaServer/calzone/target/classes/messages_nl.properties
Merge pull request #81 from nicocarraggi/nicodev

add & remove Enrollment
Merge commit '83942a37791b41f4d50befb8b21c1b0b7187f56e'