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
Merge pull request #113 from thatcoderguy/Development

Merge pull request #111 from thatcoderguy/master
Merge pull request #114 from thatcoderguy/master

Merge Changes