Fixing the occupants bug.
Merge branch 'development' of github.com:scrollback/scrollback into development