Merge branch 'hotfix/cors' into develop
added * to allowed origins
Merge branch 'hotfix/cors'