Add "Edit user functionality"
Merge branch 'master' into Jacob-EditUser
Reflect file moves.
Merge pull request #29 from jhorbulyk/Jacob-EditUser

Add "Edit user functionality"