Expanded User model

Added passwords mostly.
Merge branch 'Modeling-Users'