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
import json missing from updates api_views
Merge branch 'update_all' of https://github.com/bcipolli/ka-lite into update_all
Fix paragraph height issue.
Added complete to update via zip command.
Add links to each buttons. Solve color conflits from Khansite.css
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into proper_browser_caching

Conflicts:
	kalite/main/views.py
	kalite/securesync/api_views.py
addressing #484, fixing merge conflict issue
Merge branch 'release-0.10' of github.com:learningequality/ka-lite into videoscan_caching_bug

Conflicts:
	kalite/securesync/api_views.py
Fixes to the nav bar to address code review.
Fixes to the main browser tests to get them all to pass again.
Merge branch 'release-0.10' into ie_fixes

Conflicts:
	kalite/templates/base_distributed.html