Update reset password page

It was using an outdated api to get the reset token, and was not
allowing users to reset their password.

http://stackoverflow.com/questions/18661663/upgrading-to-devise-3-1-getting-reset-password-token-is-invalid
Merge branch 'master' into production