Merge pull request #3 from bcipolli/checkconnection

Close to done
Merge pull request #4 from bcipolli/checkconnection

Use a SCRIPT tag, to hack around the cross-site scripting complaints
update in if statement
update
Merge branch 'checkconnection' of github.com:ruimalheiro/ka-lite into checkconnection
General JS helper functions and auto-checking as needed for online status.

Also, used them on the video download page.
Merge pull request #5 from bcipolli/checkconnection

Merge to latest develop, fix merge conflicts
Merge branch 'checkconnection' of https://github.com/ruimalheiro/ka-lite into checkconnection

Conflicts:
	kalite/static/js/khan-lite.js
Ordering tweak to put the globally run JS together in one place.
Some tweaks to catch things missed in the pull request.
Merge pull request #6 from jamalex/checkconnection

General JS helper functions and auto-checking as needed for online status.
Reworked connection checking as per code review, switched to Deferreds.
Merge branch 'develop' of github.com:learningequality/ka-lite into checkconnection

Conflicts:
	kalite/securesync/api_views.py
Tweaks to JSONP decorator, and added a JSONP response object type.
CSS tweaks to prevent "-only" elements from popping out and in.
raise Http404, not return
Merge pull request #436 from bcipolli/raise_not_return

raise Http404, not return
Merge branch 'release-0.10' into checkconnection

Conflicts:
	kalite/main/views.py
	kalite/securesync/api_views.py
	kalite/static/js/distributed-server.js
	kalite/templates/admin_distributed.html
	kalite/templates/video_download.html
	kalite/utils/decorators.py
Fixes to checkconnection code to address code review.
Add CORS headers to allow_jsonp decorator, enabling cross-origin requests.