Merge branch 'develop'

* develop:
  Fixes issue with edX
  Adding CORS to serve.py
  Change autodiscovery
Added ping
Adding jquery-ui.d.ts
Update stuff
Formating changes
Adding underscore
Merge branch 'master' into develop

* master:
Merge pull request #24 from iceraj/develop

Develop