Move setting cors properties
Merge pull request #323 from stianst/master

Move setting cors properties