Implementing searchavailabletypes
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/seed/BookingSystem.java
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Redid class diagram
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

Conflicts:
	se.chalmers.mdsd.2014.group9/src/Classes/ClassDiagram/impl/BookableObjTypeImpl.java