Development all around
Merge branch 'master' of github.com:noorus/chat-ng

Conflicts:
	client/js/chat-ng.js
	client/sass/chat-ng.scss