added server handling new user and sent message
Merge branch 'upstream'