cors support for api
Merge branch 'enhancements'