CreditCard changes
Merge branch 'dev' of github.com:ModelDrivenMiddleEarth/ModelDrivenHotel into dev

Conflicts:
	se.chalmers.mdsd.2014.group9/src/Classes/ClassDiagram/impl/AllUsersUsageImpl.java
Merge branch 'dev' of github.com:ModelDrivenMiddleEarth/ModelDrivenHotel into dev