Subtree merged in playground
Merge remote-tracking branch 'origin/mount-branch'

Conflicts:
	.gitignore
Merge branch 'master' of github.com:bcipolli/playground into HEAD
Merge commit '7c897cb3c82d8b1dd9ed6ed2ff1219f2b109a56c' as 'docs/overview'
Merge commit 'b927bd58ae409e78358e4b56fdbd4986a3e78b68' as 'kalite/static/js/khan-exercises'
-n 
Move utils to fle_utils
Move utils to fle_utils
-n 
separate distributed website (distributed) from topic data (main)
-n 
Merge branch 'develop' of github.com:learningequality/ka-lite into 1393

Conflicts:
	kalite/facility/views.py
	kalite/i18n/__init__.py
	kalite/khanload/api_views.py
	kalite/main/topic_tools.py
	kalite/manage.py
	kalite/shared/decorators/auth.py
	kalite/updates/management/commands/languagepackdownload.py
	kalite/updates/management/commands/videodownload.py
	kalite/updates/management/commands/videoscan.py
-n 
Merge branch 'develop' of github.com:learningequality/ka-lite into distributed-refactor

Conflicts:
	kalite/distributed/views.py
	kalite/updates/management/commands/languagepackdownload.py
	kalite/updates/management/commands/videodownload.py
	kalite/updates/management/commands/videoscan.py
-n 
Fixing remaining caching imports, separating tests
-n 
Removing calls to logging from fle_utils code
-n 
Refactoring the config module to fle_utils, to remove KA Lite-specific dependencies from securesync
-n 
Moving the chronograph app to fle_utils
-n 
Start removing dependencies of securesync on anything but annoying and fle_utils
-n 
Refactoring VERSION and test code.
-n 
Fixing bug in serializer reference.
-n 
Fixing bug in serializer reference.
-n 
fix import of chronograph.Job model
-n 
Merge pull request #1681 from bcipolli/securesync-refactor

Securesync refactor