oLd Inventory class deleted
Merge branch 'master' of https://github.com/faern/book-a-hobbit

Conflicts:
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/InventoryManagerImpl.java
Merge branch 'master' of https://github.com/faern/book-a-hobbit
Merge branch 'master' into checkin
Added getEnabledRooms to inventory manager
ARoom & AType attributes in model
Merge branch 'master' of https://github.com/faern/book-a-hobbit.git
category in typecontroller
Merge branch 'master' of https://github.com/faern/book-a-hobbit
CodeGen with last commit model changes
ImpDiag arranged
type moved from AType to AUnit in model
AType attributes
Model: default values for ARoom
AUnit & A Room constructors
Code generated from recent changes
AType modification
minor
ATypeReservation constructor
Model: arrange