Payment debugging going forward
Merge branch 'dev' of github.com:ModelDrivenMiddleEarth/ModelDrivenHotel into dev

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/Classes/ClassDiagram/impl/TestCancelBooking.java
	se.chalmers.mdsd.2014.group9.test/src/seed/BookingSystem.java