Forgot password fix.
Forgot password 2nd fix.
Change log.
Merge branch 'master' of heroku.com:verily
Time logging on crisis and question pages for testing
Merge remote-tracking branch 'origin/master'