Merge pull request #2 from CalZoneVUB/master

Reverse pull request
Merge pull request #3 from CalZoneVUB/master

Reverse pull request
Home pagina versie 1 (vertical box)
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
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 pull request #51 from gaethofs/master

Homepage versie 1
Merge pull request #4 from CalZoneVUB/master

Reverse pul request
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