fix issue
Merge branch 'master' of https://github.com/majidabbasi96/app

Conflicts:
	res/values/strings.xml

[jaber] tset1