Change autodiscovery
Adding CORS to serve.py
Fixes issue with edX
Merge branch 'develop'

* develop:
  Fixes issue with edX
  Adding CORS to serve.py
  Change autodiscovery