-added user management stuff to the data model
Merge remote-tracking branch 'origin/master'