added a comment and adjusted an int that somehow contained a letter
Added temporary to BookingStatus in papyrus
IRoombookingTests errors handled
Removed leftover interface GenericBooking
id in Category
Updated copy-constructors and id to several classes...
ICreditCard getters
codegen
Merge branch 'master' of https://github.com/faern/book-a-hobbit into can_i_see_your_id
Added methods for paying and checking the payment status of a BillItem.
Added setTab() to RoomBooking and implemented it.
Implemented makePaymentForRoomBooking, which will hopefully not be
broken after the next merge.
More methods to InventoryManager
Merge remote-tracking branch 'origin/master' into checkout2

Conflicts:
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/BillItemImpl.java
updateType and addType
More work on id and copy constructors
Merge branch 'master' of https://github.com/faern/book-a-hobbit into AddType
Merge branch 'master' of https://github.com/faern/book-a-hobbit into can_i_see_your_id
Added updateTab() to booking-classes
Implemented makePaymentForMasterBooking