add CORS support
Merge branch 'master' into valdhacks