Map update for quarters as single room
Merge branch 'master' into dialog