Fixed usernames. Userlist on connect and new user.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app.py