Correct inlezen trajecten csv !  + toevoegen van Frozen boolean.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
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

# By Pieter Meiresone (2) and nicocarraggi (1)
# Via Pieter Meiresone (2) and others
* 'master' of https://github.com/CalZoneVUB/CalZone:
  Scheduler: Refactering na aanpassingen DB. Goed restore point voor scheduler.
  Scheduler: overlapping in student agenda toevoeging.
  Correct inlezen trajecten csv !  + toevoegen van Frozen boolean.

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/ApiCalendar.java