Implemented searchAvailableObjects() method.
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Updated documentation in BookingSystem and cont'd implementation of
TestSearchAvailableObjects.
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
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Added booking3, hs3 and room6 to seed. TestSearchAvailableObjects should
now be complete.
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Variable name collision. Renamed new variables.
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Now a BookableObject cannot be added to the reception unless it has a
type!
Fixed SearchAvailableableTypes to allow either a preferredType or a
BookableObj assignment.
TestSearchAvailableObject now succeeds. Reimplemented overlap method.
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

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