Merge pull request #1 from iceraj/develop

Wholesale update
Merge branch 'master' of github.com:iceraj/starx

* 'master' of github.com:iceraj/starx:
Merge branch 'develop'

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

* master: