Added user tracking on the server.
Merge branch 'master' into NoJavaFX