Add support for options request to make CORS work
Merge pull request #48 from cdman/development

Add support for options request to make CORS work
Merge pull request #49 from udacity/development

Merge development