16/07/13 Morning Commit

Additional work on user management server and user interface.