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

Conflicts:
	Ukrainian/main/NetworkAssistant2.apk/res/values-uk/strings.xml