Merge branch 'release-hth' of github.com:learningequality/ka-lite into khanloadv2

Conflicts:
	kalite/utils/internet.py
Fixed path issue preventing successful sub download.
Added a message indicating success of sub download.
Merge branch 'release-0.10' of git://github.com/learningequality/ka-lite into develop
Merge branch 'develop' into subtitles_immediate_fix
use the new code to only show the download button if both the client and server are online
Merge branch 'release-idoc' of github.com:learningequality/ka-lite into updates_app

Conflicts:
	kalite/main/views.py
	kalite/securesync/api_views.py
	kalite/templates/admin_distributed.html
	kalite/templates/video_download.html
Merge branch 'updates_app' of github.com:bcipolli/ka-lite into updates_app
Refactored a few things in cache_subtitles
Added Ben's code back in to remove unsupported files.
Pushing an info message instead of an error message now when there aren't subs available for current vids.
Merge pull request #490 from bcipolli/test_failures

Fixing broken tests
Merge branch 'release-0.10' of git://github.com/learningequality/ka-lite into subtitles_immediate_fix
Merge pull request #470 from dylanjbarth/subtitles_immediate_fix

Subtitles immediate fix
Let's get this in!!! :D
Moved all updates api_urls and api_views into updates app.
Merge branch 'release-idoc' of github.com:learningequality/ka-lite into updates_app

Conflicts:
	kalite/main/management/commands/subtitledownload.py
	kalite/templates/video_download.html
	kalite/utils/subtitles.py
Cleaned up/fixed imports for main and updates api_views.
Merge pull request #21 from rtibbles/update_all

Encapsulate all updates view logic inside updates app.
Three images ready.
Merge branch 'updates_app' of github.com:bcipolli/ka-lite into update_all

Conflicts:
	.gitignore
	kalite/central/api_urls.py
	kalite/central/api_views.py
	kalite/central/urls.py
	kalite/main/api_views.py
	kalite/main/views.py
	kalite/static/js/distributed-server.js
	kalite/utils/general.py
	kalite/utils/internet.py