user module setup
Merge branch 'master' into working
user module updates
conflict fixes