Merge pull request #4 from CalZoneVUB/master

Reverse pul request
Merge pull request #52 from nicocarraggi/nicodev

RoomType
Room CSV
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Nieuwe home page layout en toevoeging theme-folders
- optionele thema keuze.
Merge pull request #53 from gaethofs/master

Nieuw thema
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
RoomCSV Reader working
Merge pull request #54 from fsuarezg/master

Pagina's toegevoegd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java
	JavaServer/calzone/src/main/java/com/vub/datadump/ReadCSV.java
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
	JavaServer/calzone/src/main/java/com/vub/model/ReadCSV.java
	JavaServer/calzone/target/classes/com/vub/controller/HelloController.class
Conflict Resolution
Room Fix
No old course components
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