minor changes to client, more input checking in server
Merge branch 'master' of github.com:BorisVerk/chatterbox-server

Conflicts:
	client/index.html