ADD CORS support
I can't spell
resolved conflicts
Merge branch 'cors'