updateType and addType
Merge branch 'master' of https://github.com/faern/book-a-hobbit into AddType
Fixed lots of stuff. Identifiable added that all inherit
update type almost done, waiting for some papyrus stuff.
Merge branch 'master' of https://github.com/faern/book-a-hobbit into AddType

Conflicts:
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/InventoryManagerImpl.java
Added AIdentifiable and drew lots of arrows
Merge branch 'master' of https://github.com/faern/book-a-hobbit
Merge branch 'master' into checkout2

Conflicts:
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/AGenericBooking.java
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/BillItemImpl.java
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/PaymentControllerImpl.java