Read Rooms
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into nicodev
update
SchedulerInitializer.java
Merge commit '00fb871a608a0ee78e8e0ca5e064ef0a2685bbd5' into BackEnd
Merge branch 'MyMaster' into Scheduling
1 lokaal wordt correct ingelezen van datadump, daarna error.
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into nicodev
vervollediging eerste constraint + koppeling aan  solver.xml
Merge branch 'MyMaster' into Scheduling
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into BackEnd
Merge branch 'BackEnd' into Schedular
Merge pull request #142 from yocoppen/Scheduling

Scheduling update to Drools
Merge commit '12dae3e6eb395a345ff9bd1c9992c3ed84421af4' into Schedular
Merge pull request #144 from CalZoneVUB/Schedular

Schedular
Shit voor fernando
Merge pull request #145 from svdvonde/master

Shit voor fernando
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