temp
Merge branch 'master' of https://github.com/xpush/stalk.io

Conflicts:
	public/js/stalk/chat.js
Merge branch 'master' of https://github.com/xpush/stalk.io
/auth/:boolean modified