Merge branch 'master' into Taxi
add Taxi Item List
add TX
Merge branch 'master' into Taxi
add Taxi in Trip
Add Instrument
Merge branch 'Taxi'

Conflicts:
	SmartTravel/AndroidManifest.xml
	SmartTravel/res/values/strings.xml
	SmartTravel/src/com/smarttravel/InstrumentsListActivity.java
fixed error in instrument feature
Merge branch 'master' of https://github.com/minhtucs/SmartTravelClient