Delete HelloController.class
Merge commit 'e75532c640ef98a6848553c995d356a9a111df6b'

Conflicts:
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class
Remove hellocrontroller.class
Merge commit '72c1363fbdcada63adbd12f9ed726d73887e3f12' into Dev
Merge commit '72c1363fbdcada63adbd12f9ed726d73887e3f12'
Merge branch 'Dev'
No old course components
Room, User en Course.
Courses aanpassing
Merge pull request #56 from nicocarraggi/nicodev

Room, User en Course.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class
Merge pull request #55 from fsuarezg/master

navigatiebalk
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Course.java

Ready to load data into database.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
CourseDao
Merge pull request #57 from nicocarraggi/nicodev

Nicodev
test3
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Course.java