room: buildingId member to building Object
Merge remote-tracking branch 'origin/master' into SlowAugmentation
adjusted view to new building objects in rooms
interchanged roomId to room Object in Appointment and adjusted view
git log/same with course in Appointment
update pom with exclusion for log4j
same with slot in Appointment
same with semester in Appointment
update roomOccupancy view
added log4j.xml
update dao class
exchanged facultyId for Faculty in Building
fixed semester toString increment bug
fixed wrong annotation in Building, accidentially annotated the setFaculty method instead of getFaculty
slowAugmentation finalized
Merge branch 'SlowAugmentation'