Merge branch 'LoginUpdate' into ShaneEditUserFix
ShaneEditUserFix: EditUser fully functional.
Merge pull request #47 from jarradm/ShaneEditUserFix

Shane edit user fix