add access-control-allow-origin
Merge branch 'develop'