This is it
I am pushing
Merge branch 'Reza3' into Victor

Conflicts:
	res/values/strings.xml
	src/com/example/pickuplistapp/Map.java
Post merge. Search bar and autocomplete