finishing user functionality
trying to fix some problems with history
Merge branch 'master' into updating-users