Implemented the new room class and the new objectcraetor interface to the project and fixed the errors the change caused.
Fixed merging problems