merge
Merge branch 'master' of github.com:markusberget/tda593-hotel
Merge branch 'master' of github.com:markusberget/tda593-hotel

Conflicts:
	src/Classes/impl/IBookingManagementImplImpl.java
Updated the component diagram