Merge remote-tracking branch 'upstream/develop' into contact_ux

Conflicts:
	kalite/settings.py
	kalite/urls.py
Merge branch 'contact_ux' of github.com:bcipolli/ka-lite into contact_ux