search hotel
Merge branch 'master' into tourist_place
implement search hotel
implement search hotel
implemented pusher service and implementing addtrip activity
Merge branch 'tourist_place'

Conflicts:
	SmartTravel/res/layout/activity_add_trip.xml