stuff
user changes
Merge branches 'modeling-users' and 'master'