updated users_controller
Merge branch 'development' of github.com:awanderingorill/snippets into development