added cors option to server
Merge remote-tracking branch 'upstream/master'
enabled cors in cfg file