Updated Connection.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/serverTCP/Connection.java
Merge remote-tracking branch 'origin/master'
Updated RemoteUserManager and UserManager to return user id on authentication.