navigatie balk in apart jsv file gezet
Merge branch 'FerDev'
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
Course
Merge pull request #58 from nicocarraggi/nicodev

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