error page changes.
Merge remote-tracking branch 'ta/master'
regenerate api_key fix