Tidied up broadcast typing method
Merge branch 'dev' of https://github.com/FitroApp/Kiwi into dev

Conflicts:
	public/js/client.js