Reverting CORS support, added it from the webserver config
Merge pull request #50 from cdman/development

Reverting CORS support, added it from the webserver config
Merge pull request #51 from udacity/development

Merge development