added activities and layouts
Merge branch 'master' into flight

Conflicts:
	SmartTravel/AndroidManifest.xml
	SmartTravel/res/values/strings.xml
nothing
implement restaurant, touristplace review. Fix filter
implemented search flight feature
nothing
Merge branch 'flight'
s
Merge branch 'review-hotel' of https://github.com/minhtucs/SmartTravelClient into review-hotel

Conflicts:
	SmartTravel/src/com/smarttravel/services/AbstractWebService.java
Merge branch 'review-hotel'

Conflicts:
	SmartTravel/AndroidManifest.xml
	SmartTravel/res/values/strings.xml