增加我的收藏页面
Merge branch 'master' of https://github.com/xw8852/guoli

Conflicts:
	guoli/AndroidManifest.xml
	guoli/res/values/strings.xml
	guoli/src/com/guoli/hotel/activity/FavoriteActivity.java