typofix_merge_fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Russian/main/Settings.apk/res/values-ru/strings.xml
hz_issue