fix
fix
Merge remote-tracking branch 'origin/master'

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