adding door to common room
Merge branch 'master' into devel-chris
~ files ignored