Merge pull request #23 from thatcoderguy/master

Merge changes.
Updates to password view
Merge pull request #54 from widagroup/master

Updates to password view