Merge branch 'release-0.10' of github.com:learningequality/ka-lite into develop
Merge branch 'develop' of github.com:learningequality/ka-lite into mplayer_launcher

Conflicts:
	kalite/main/api_views.py
	kalite/main/views.py
	kalite/settings.py
	kalite/static/js/videoplayer.js
	kalite/templates/video.html
updating based on code reviews, more fully merging with existing changes
fixing merge bug, moving code from template to static file
Merge branch 'mplayer_launcher' of https://github.com/bcipolli/ka-lite into mplayer_launcher

Conflicts:
	kalite/main/api_views.py
	kalite/main/views.py
	kalite/static/js/videoplayer.js
	kalite/templates/video.html