+ added CORS headers like at engine
Merge branch 'master' into heroku