Fix seek method to work for video.js (and renamed from seekTo).
Fix srts metadata, rename internal parameters to make logic more straightforward.

Conflicts:
	kalite/i18n/management/commands/update_language_packs.py
	kalite/shared/i18n.py

Conflicts:
	kalite/i18n/management/commands/update_language_packs.py
	kalite/shared/i18n.py
fix bug on missing variable
Teseting fixes, and needed LOG reordering in settings.py
Allow languagepackdownload option to use a local zip file
Merge pull request #1345 from aronasorman/1281

Fix1281: Option in languagepackdownload to allow using a local zip file.
add http_proxy settings
add HTTPS_PROXY setting
Merge pull request #1349 from aronasorman/846

#846: Add http{,s}_proxy settings.
Convert all codes to IETF format, capitalize where desired (#1346)
Add more metadata to language packs, expose to user.
Fix bug, force low_mem=True
Fixing missing os import
Merge pull request #1350 from bcipolli/1019

Better display names for language switching
Merge branch 'develop' into 1348

Conflicts:
	data/i18n/languagelookup.json