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
Profile Page
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Professor Read + Json
Profielpagina update
CSV Reader
Data Dump
HashCode Fix for Assistent and Professor
Merge branch 'Dev'
Merge pull request #50 from MPieter/master

Aanpassing Profile page
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/ReadCSV.java
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