Bug fixes
Security bouncer now checks rooms
Merge branch 'fresh' of https://github.com/FitroApp/Kiwi into fresh

Conflicts:
	src/emitter.js
	src/main.js