Merge branch 'i18n' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Merging to allow Bill to pull and test, and to prevent bigger merge conflicts as more code changes.
Merge branch 'develop' of github.com:jamalex/ka-lite into develop

Conflicts:
	kalite/main/views.py

Merged i18n conflicts (bonus: found some strings we missed!)