:D
Merge branch 'classcodegens' of https://github.com/dannylam/ogretel.git
into classcodegens

Conflicts:
	Papyrus/Make a Booking/src/bookingmodel/impl/BookingProvidesImpl.java