Merge branch 'master' into George-Mason
Added password lookup.
Fixed forgot password logic.
Force commit
Merge branch 'George-Mason'