Xedit
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Delete course + traject
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Traject Add Buzzy
Edit Traject
Merge pull request #202 from nicocarraggi/nicodev

Nicodev
Scheduler: overlapping in student agenda toevoeging.
Merge commit '8a462fbd6eec706b59797c7d031b423d8c7ce50f'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Course.java
	JavaServer/calzone/src/main/java/com/vub/model/Entry.java
	JavaServer/calzone/src/main/java/com/vub/scheduler/SchedularSolver.java
Scheduler: Refactering na aanpassingen DB. Goed restore point voor scheduler.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Setting
Admin dashboard link for ADMIN