add
Merge branch 'master' into Taxi

Conflicts:
	SmartTravel/AndroidManifest.xml
	SmartTravel/src/com/smarttravel/TaxiDetailActivity.java
add Ta xi
Merge branch 'master' into Taxi

Conflicts:
	SmartTravel/AndroidManifest.xml
	SmartTravel/src/com/smarttravel/InstrumentsListActivity.java
resolved conflicted
fixed issue set data incorrectly in ArrivalCitiesArrayAdapter