Create Tables voor Courses.
no message
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
no message
Rooms
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
	JavaServer/calzone/src/main/java/com/vub/model/ReadCSV.java
	JavaServer/calzone/src/main/java/com/vub/model/Room.java
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Room
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Rooms
Merge pull request #52 from nicocarraggi/nicodev

RoomType
Room CSV
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Merge pull request #53 from gaethofs/master

Nieuw thema
Delete HelloController.class
Merge commit 'e75532c640ef98a6848553c995d356a9a111df6b'

Conflicts:
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class
ingeschreven vakken pagina afgemaakt, dummy data toegevoegd
Merge branch 'FerDev'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class