added config for CORS
resolve merge
merge of eds code