Merge pull request #39 from thatcoderguy/master

Merge changes
Update PasswordController.cs
Merge pull request #112 from widagroup/master

Merge pull request #39 from thatcoderguy/master