Added a comment for further investigation
Handle wildcard in access-control-allow-origin
Merge branch 'development'