Fix tagging for and references to translations
Use lazy translation for importer strings
Merge branch 'master' into i18n-updates

Conflicts:
	corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
Merge pull request #1755 from dimagi/i18n-updates

Fix tagging for and references to translations