Commit hotel temp
commit hotel branch
Merge branch 'hotel'

Conflicts:
	bin/SmartTravel.apk
	bin/classes.dex
	bin/classes/com/smarttravel/R$drawable.class
	bin/classes/com/smarttravel/R$id.class
	bin/classes/com/smarttravel/R$layout.class
	bin/classes/com/smarttravel/R$menu.class
	bin/classes/com/smarttravel/R$string.class
	bin/classes/com/smarttravel/R$style.class
	bin/classes/com/smarttravel/TripsListActivity$1.class
	bin/classes/com/smarttravel/TripsListActivity.class
	bin/classes/com/smarttravel/adapters/TripsArrayAdapter.class
	bin/classes/com/smarttravel/customviews/TripItemView.class
	bin/classes/com/smarttravel/models/trip/TripArrivalCityModel.class
	bin/classes/com/smarttravel/parsers/BaseJsonParser.class
	bin/classes/com/smarttravel/parsers/RestaurantParser.class
	bin/classes/com/smarttravel/services/fetcher/BaseDataFetcherService.class
	bin/classes/com/smarttravel/services/fetcher/RestaurantFetcherService.class
	bin/resources.ap_
	gen/com/smarttravel/R.java
	res/values/strings.xml