remove package contents
Merge branch 'master' of https://github.com/minhtucs/SmartTravelClient
implemented flight search feature
Merge branch 'master' into flight
implemented flight search list and flight events list
implemented flight feature
implement edit restaurant, touristplace
implemented album and photo activity
added FacebookSdk library
implementing uploading photo feature
implement delete touristplace, restaurant item
share photo
Merge remote-tracking branch 'remotes/origin/edit-restaurant-touristplace'

Conflicts:
	SmartTravel/AndroidManifest.xml
	SmartTravel/res/values/strings.xml
	SmartTravel/src/com/smarttravel/FlightEventDetailActivity.java
	SmartTravel/src/com/smarttravel/FlightEventsListActivity.java
	SmartTravel/src/com/smarttravel/FlightSearchsListActivity.java
	SmartTravel/src/com/smarttravel/HotelsSearchListActivity.java
	SmartTravel/src/com/smarttravel/RestaurantsListActivity.java
	SmartTravel/src/com/smarttravel/SearchFlightActivity.java
	SmartTravel/src/com/smarttravel/TripsListActivity.java
	SmartTravel/src/com/smarttravel/WelcomeActivity.java
	SmartTravel/src/com/smarttravel/global/GlobalStorage.java
	SmartTravel/src/com/smarttravel/models/flight/AirlineModel.java
	SmartTravel/src/com/smarttravel/models/flight/FlightDetailModel.java
	SmartTravel/src/com/smarttravel/models/flight/FlightItemModel.java
	SmartTravel/src/com/smarttravel/parsers/FlightParser.java
	SmartTravel/src/com/smarttravel/services/fetcher/FlightFetcherService.java
	SmartTravel/src/com/smarttravel/tasks/FlightFetchAsyncTask.java