fixed admin ability to edit user
Merge branch 'master' of github.com:jingar/victory_lies_ahead