added user identification. TODO: check for duplicate users to server
Merge branch 'master' of github.com:mrundle/DotBoxing