Correct RoomType and add LaboratoryRoom, MeetingRoom, ClassRoom
Merge origin/master