enable CORS
Merge branch 'CORS' into develop

* CORS:
  enable CORS