removed imports
Merge branch 'TestModel' of https://github.com/faern/book-a-hobbit.git into TestModel
Merge branch 'TestModel' of https://github.com/faern/book-a-hobbit.git
into TestModel

Conflicts:
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/TypeControllerImpl.java