testing TripFetcherService service
Merge branch 'master' of https://github.com/hdkhiem89/SmartTravel

Conflicts:
	src/com/smarttravel/models/trip/TripArrivalCityModel.java