getRoomTypeId tested 'n done
Merge branch 'classcodegens' of https://github.com/dannylam/ogretel.git
into classcodegens

Conflicts:
	Papyrus/Make a
Booking/src/maintenancemodel/impl/RoomMaintenanceImpl.java