fix makemessages call to be more restrictive in what is included
change call of khanload to contentload, since it's outdated
fix bad merges
Merge branch 'i18n' into feature/210-extend-update_language_packs-to-only-build-the-right-po-file-per-version

Conflicts:
	ka-lite-submodule