add action search icon
Merge branch 'master' into restaurant/move-search-view-to-actionbar
Merge branch 'master' into restaurant/move-search-view-to-actionbar
add Taxi
add Taxi Detail
add resources for actionbars
resolved conflicted
added action add on action bar
implement tab photo for hotel.
reset min api to 8
Merge branch 'hotel'

Conflicts:
	SmartTravel/res/values/strings.xml
fixed string.xml
Merge branch 'Taxi'

Conflicts:
	SmartTravel/AndroidManifest.xml
	SmartTravel/res/layout/activity_taxies_list.xml
	SmartTravel/res/values/strings.xml
	SmartTravel/src/com/smarttravel/TaxiesListActivity.java
resolved conflict