EDX-270: Redirect disabled account to disabled_account.html
Merge pull request #168 from yokose-ks/EDX-270

EDX-270: Redirect disabled account to disabled_account.html
EDX-299: Fix error messages in password reset confirm
Merge pull request #169 from yokose-ks/EDX-299

EDX-299: Fix error messages in password reset confirm