Nothing to report.
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/guestclient/TestGuestScenario.java
Added makePayment() procedure to TestGuestScenario.
Added some exception handling to BookingImpl.addHotelStay(). Still need
to make it void.
ReceptionImpl now properly casts Exceptions.
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/guestclient/TestGuestScenario.java
	se.chalmers.mdsd.2014.group9/src/Classes/ClassDiagram/impl/ReceptionImpl.java