Read Rooms
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into nicodev
1 lokaal wordt correct ingelezen van datadump, daarna error.
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #145 from svdvonde/master

Shit voor fernando
Classroom pagina met x-editable
Eerste versie inladen Courses + afgewerkte versie inladen Rooms.
Merge pull request #150 from nicocarraggi/nicodev

Nicodev
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/Building.java
	JavaServer/calzone/src/main/java/com/vub/model/Floor.java
	JavaServer/calzone/src/main/java/com/vub/model/Institution.java
	JavaServer/calzone/src/main/java/com/vub/model/Room.java
	JavaServer/calzone/src/main/java/com/vub/service/BuildingService.java
Merge branch 'dev'
Correctie bij het inladen van Courses.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #151 from nicocarraggi/nicodev

Nicodev
Classrooms pagina test
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'dev'
Classrooms pagina met x-editable
Merge branch 'dev'