Merge pull request #81 from nicocarraggi/nicodev

add & remove Enrollment
FR 2.1 Fixes
Merge commit '83942a37791b41f4d50befb8b21c1b0b7187f56e'
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev