Merge branch 'develop' of github.com:bcipolli/ka-lite into khanloadv2

Conflicts:
	kalite/coachreports/views.py
	kalite/settings.py
Merge branch 'khanloadv2' into demo_idoc
manual fix of khanload