Merge pull request #111 from Rakulon/master

Password reset, so many password things..
password reset complete