Merge pull request #113 from svdvonde/Courses

Courses
Tijdelijke User model
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/User.java
	JavaServer/calzone/target/classes/messages.properties
	JavaServer/calzone/target/classes/messages_nl.properties
Merge pull request #114 from nicocarraggi/nicodev

Nicodev
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into user
[NIET WERKEND] Services aangemaakt en vanalles gedaan