Seperated book object and type booking and moved bookObjects to AdminInterface.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	se.chalmers.mdsd.2014.group9/src/Classes/ClassDiagram/impl/CustomerUsageImpl.java
Minor fixes for separating booking types and objects.