Merge branch 'master' into i18n-update
remove untranslated languages
Merge branch 'i18n-update' into i18n

Conflicts:
	helpdesk/locale/fa_IR/LC_MESSAGES/django.po
	helpdesk/locale/fi/LC_MESSAGES/django.po
	helpdesk/locale/hu/LC_MESSAGES/django.po
	helpdesk/locale/zh_CN/LC_MESSAGES/django.po