Cherry-picked "MapFragment and some little changes", resolved conflicts

Conflicts:
	AndroidManifest.xml
	res/layout/activity_search.xml
	res/layout/activity_search_result.xml
	res/values/strings.xml
	src/com/codepath/apps/wheretoeat/YelpClient.java
	src/com/codepath/apps/wheretoeat/activity/SearchActivity.java