Basic User model (including secure passwords)
Merge branch 'ew-dev'