bjhkh
Merge branch 'master' into andrey_activity_i_lost_found

Conflicts:
	ILost/AndroidManifest.xml
	ILost/res/values/strings.xml