...
Merge branch 'master' of github.com:templefox/CulturePlatform

Conflicts:
	bin/CulturePlatform.apk
	bin/classes.dex
	bin/classes/com/example/cultureplatform/DetailActivity$1.class
	bin/classes/com/example/cultureplatform/DetailActivity$2.class
	bin/classes/com/example/cultureplatform/DetailActivity$3.class
	bin/classes/com/example/cultureplatform/DetailActivity$4.class
	bin/classes/com/example/cultureplatform/DetailActivity$5.class
	bin/classes/com/example/cultureplatform/DetailActivity.class
	bin/classes/com/example/cultureplatform/LoginActivity$1$1.class
	bin/classes/com/example/cultureplatform/LoginActivity$1.class
	bin/classes/com/example/cultureplatform/LoginActivity.class
	bin/classes/com/example/cultureplatform/MainActivity$1.class
	bin/classes/com/example/cultureplatform/MainActivity.class
	bin/classes/com/example/cultureplatform/R$drawable.class
	bin/classes/com/example/cultureplatform/R$id.class
	bin/classes/com/example/cultureplatform/R$layout.class
	bin/classes/com/example/cultureplatform/R$menu.class
	bin/classes/com/example/cultureplatform/R$string.class
	bin/classes/com/example/cultureplatform/R$style.class
	bin/classes/com/example/cultureplatform/R$styleable.class
	bin/classes/com/example/cultureplatform/SearchActivity.class
	bin/classes/com/example/cultureplatform/StartActivity$init_task$1.class
	bin/classes/com/example/cultureplatform/StartActivity$init_task.class
	bin/classes/com/example/cultureplatform/UserActivity.class
	bin/classes/com/example/database/DatabaseConnector.class
	bin/classes/com/example/database/MessageHandler.class
	bin/classes/com/example/fragment/CalendarFragment.class
	bin/classes/com/example/fragment/ClassifyFragment$5$1$1.class
	bin/classes/com/example/fragment/ClassifyFragment$5$1.class
	bin/classes/com/example/fragment/ClassifyFragment$6.class
	bin/classes/com/example/fragment/ClassifyFragment$7.class
	bin/classes/com/example/fragment/ClassifyFragment.class
	bin/classes/com/example/fragment/RecommendFragment$1.class
	bin/classes/com/example/fragment/RecommendFragment.class
	bin/classes/com/example/fragment/TestFragment.class
	bin/classes/com/example/fragment/UserFragment.class
	bin/classes/com/example/fragment/item/CalendarItemAdapter.class
	bin/classes/com/example/fragment/item/ClassifyItemAdapter.class
	bin/classes/com/example/fragment/item/RecommendItemAdapter.class
	bin/classes/com/example/fragment/item/UserItemAdapter.class
	bin/classes/com/example/widget/Optionor.class
	bin/classes/com/example/widget/TextRatingBar.class
	bin/dexedLibs/android-support-v13-6d426400f41ce5cc0fd1139a0a4ff8f8.jar
	bin/jarlist.cache
	bin/resources.ap_
	gen/com/example/cultureplatform/R.java
	project.properties
	src/com/example/cultureplatform/DetailActivity.java