use python.org package instead of github for CORS
Merge branch 'devel'

Conflicts:
	requirements.txt