Change autodiscovery
Merge pull request #22 from iceraj/develop

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
Merge pull request #23 from iceraj/develop

edX fix
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
Merge branch 'develop'

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

Conflicts:
	mapping.txt