added name column to user model
Merge branch 'user_mods'