Merge pull request #1 from yaojiani77/master

set up database
Merge pull request #2 from yaojiani77/master

add entertainment event activity
Merge pull request #3 from yaojiani77/master

revise home
revise databse & ItemCF
Merge branch 'pr/4'

Conflicts:
	bin/TripAssistant.apk
	bin/classes.dex
	bin/classes/com/example/tripassistant/MainActivity.class
	bin/resources.ap_
	res/menu/ts_menu.xml
merge
ts_menu
data source
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
event detail
Merge branch 'master' of https://github.com/XinGao/TripAssistant

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	bin/AndroidManifest.xml
	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/MainActivity.class
	bin/classes/com/example/tripassistant/ProfileActivity.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
profile
Merge branch 'master' of https://github.com/XinGao/TripAssistant

Conflicts:
.classpath
AndroidManifest.xml
bin/AndroidManifest.xml
bin/TripAssistant.apk
bin/classes.dex
bin/classes/com/example/tripassistant/CartActivity.class
bin/classes/com/example/tripassistant/EntertainmentSelectActivity.class
bin/classes/com/example/tripassistant/MainActivity.class
bin/classes/com/example/tripassistant/ProfileActivity.class
bin/classes/com/example/tripassistant/R$id.class
bin/classes/com/example/tripassistant/R$layout.class
bin/classes/com/example/tripassistant/R$menu.class
bin/classes/com/example/tripassistant/R$string.class
bin/classes/com/example/tripassistant/R$style.class
bin/classes/com/example/tripassistant/RestaurantSelectActivity.class
bin/classes/com/example/tripassistant/SettingActivity.class
bin/classes/com/example/tripassistant/TripAssistantDatabaseHelper.class
bin/resources.ap_
gen/com/example/tripassistant/R.java
res/layout/activity_main.xml
res/menu/ts_menu.xml
src/com/example/tripassistant/ProfileActivity.java
src/com/example/tripassistant/TripAssistantDatabaseHelper.java
Merge branch 'master' of https://github.com/XinGao/TripAssistant

Conflicts:
.classpath
AndroidManifest.xml
bin/AndroidManifest.xml
bin/TripAssistant.apk
bin/classes.dex
bin/classes/com/example/tripassistant/CartActivity.class
bin/classes/com/example/tripassistant/EntertainmentSelectActivity.class
bin/classes/com/example/tripassistant/MainActivity.class
bin/classes/com/example/tripassistant/ProfileActivity.class
bin/classes/com/example/tripassistant/R$id.class
bin/classes/com/example/tripassistant/R$layout.class
bin/classes/com/example/tripassistant/R$menu.class
bin/classes/com/example/tripassistant/R$string.class
bin/classes/com/example/tripassistant/R$style.class
bin/classes/com/example/tripassistant/RestaurantSelectActivity.class
bin/classes/com/example/tripassistant/SettingActivity.class
bin/classes/com/example/tripassistant/TripAssistantDatabaseHelper.class
bin/resources.ap_
gen/com/example/tripassistant/R.java
res/layout/activity_main.xml
res/menu/ts_menu.xml
src/com/example/tripassistant/MainActivity.java
src/com/example/tripassistant/ProfileActivity.java
src/com/example/tripassistant/TripAssistantDatabaseHelper.java
merge
Merge branch 'master' of https://github.com/yaojiani77/TripAssistant

Conflicts:
	res/layout/activity_setting.xml