added cors to server config
Merge pull request #1 from doggyloot/dev

add primary build to master
Merge branch 'master' into dev
added lots of comments