minor fixes
Merge branch 'pluginUI' of github.com:scrollback/scrollback into pluginUI

Conflicts:
	core/api/room.js