Merge pull request #2629 from guardian/json-not-found

JsonNotFound now understands CORS
Merge branch 'master' of github.com:guardian/frontend into credentials