Data Retrival
Merge branch 'master' of https://github.com/XinGao/TripAssistant

Conflicts:
	bin/TripAssistant.apk
	bin/classes.dex
	bin/classes/com/example/tripassistant/DataRetrival.class
	bin/classes/com/example/tripassistant/EntertainmentSelectActivity.class
	bin/classes/com/example/tripassistant/TripAssistantDatabaseHelper.class
	bin/resources.ap_
	res/menu/ts_menu.xml
	src/com/example/tripassistant/DataRetrival.java
	src/com/example/tripassistant/EntertainmentSelectActivity.java
	src/com/example/tripassistant/TripAssistantDatabaseHelper.java