users controller
user model amended
Merge branch 'rswill-master'