Continuation of implementation for AddExtrasToBooking test. Minor
addition to System.java class.
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

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/Classes/ClassDiagram/impl/TestAddExtrasToABooking.java
	se.chalmers.mdsd.2014.group9.test/src/seed/System.java
Renamed test for addition of Extras to contain the keyword Accessory
instead and more implementation. Also BookingSystem now adds
accessories.
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/Classes/ClassDiagram/impl/TestAddExtrasToABooking.java
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev
Now adds accessory "MiniBar" to type "DoubleBedRoom".
Merge branch 'dev' of
ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into
dev

Conflicts:
	se.chalmers.mdsd.2014.group9.test/src/seed/BookingSystem.java
Implementation of accessory-adding is now complete except for getting
type of RoomImpl.
Merge branch 'dev' of ssh://git@github.com/ModelDrivenMiddleEarth/ModelDrivenHotel.git into dev