.
.
Search activity
chat no onwer
.
Merge remote-tracking branch 'origin/BranchLucio'

Conflicts:
	SaveFoods/AndroidManifest.xml
	SaveFoods/bin/AndroidManifest.xml
	SaveFoods/bin/R.txt