Did some more work with room generation

Need a much better system for placing objects in the room.
Merge remote-tracking branch 'origin/Development'