add support for cors headers
Merge branch 'master' into push_endpoint