Start up van Schedular
Merge commit 'abcee202f9a35bd911e12011656e9fe7db798118' into Schedular

Conflicts:
	JavaServer/calzone/target/m2e-wtp/web-resources/META-INF/maven/com.vub/calzone/pom.xml
Commit voor merge van pom.xml
Merge branch 'master' into Schedular

Conflicts:
	JavaServer/calzone/target/m2e-wtp/web-resources/META-INF/maven/com.vub/calzone/pom.xml
Stop tracking of pom.xml in /calzone/target
Simple Scheduling with Unit Test Success.
Merge commit '1e0c939cdf6258b83ca266d830fab82a9790318b' into Schedular

Conflicts:
	JavaServer/calzone/pom.xml
	JavaServer/calzone/target/m2e-wtp/web-resources/META-INF/maven/com.vub/calzone/pom.xml
JavaDoc for class 'SchedularSolver.java'
Merge commit 'e1d06d638cbb6f148ab8e80aa26e3b766aa7066b' into Schedular
Opstarten 2e Unit Test
Merge commit '4e08faae71d094964d6ee406ce3decb44ee94dec' into Schedular
DB veranderingen (COURSE_COMPONENT toegevoegd)
Merge branch 'db'
Getters/Setters toegevoegd
Merge pull request #129 from svdvonde/master

CourseComponent toegevoegd
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into nicodev
1 lokaal wordt correct ingelezen van datadump, daarna error.