backup
Merge remote-tracking branch 'remotes/origin/beta' into Fire

Conflicts:
	androidmap/.classpath
	androidmap/AndroidManifest.xml
	androidmap/bin/AndroidManifest.xml
	androidmap/bin/R.txt
	androidmap/bin/androidmap.apk
	androidmap/bin/classes.dex
	androidmap/bin/classes/com/facebook/android/R$id.class
	androidmap/bin/classes/edu/yuntech/androidmap/Add_extra.class
	androidmap/bin/classes/edu/yuntech/androidmap/Add_hospital.class
	androidmap/bin/classes/edu/yuntech/androidmap/Add_restaurant.class
	androidmap/bin/classes/edu/yuntech/androidmap/Add_stay.class
	androidmap/bin/classes/edu/yuntech/androidmap/Add_view.class
	androidmap/bin/classes/edu/yuntech/androidmap/AlertDialogManager.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$1.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$10.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$11.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$12.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$13.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$14.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$15$1.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$15.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$16.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$17.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$18.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$19.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$2.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$20.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$21.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$22.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$23.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$24.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$25.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$26.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$27.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$3.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$4.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$5.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$6$1.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$6.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$7.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$8.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$9.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$CustomInfoWindowAdapter.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$Data.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap$asyncTaskProgress.class
	androidmap/bin/classes/edu/yuntech/androidmap/AndroidMap.class
	androidmap/bin/classes/edu/yuntech/androidmap/Intro.class
	androidmap/bin/classes/edu/yuntech/androidmap/Modify_extra.class
	androidmap/bin/classes/edu/yuntech/androidmap/Modify_hospital.class
	androidmap/bin/classes/edu/yuntech/androidmap/Modify_restaurant.class
	androidmap/bin/classes/edu/yuntech/androidmap/Modify_stay.class
	androidmap/bin/classes/edu/yuntech/androidmap/Modify_view.class
	androidmap/bin/classes/edu/yuntech/androidmap/R$drawable.class
	androidmap/bin/classes/edu/yuntech/androidmap/R$id.class
	androidmap/bin/classes/edu/yuntech/androidmap/R$layout.class
	androidmap/bin/classes/edu/yuntech/androidmap/R$menu.class
	androidmap/bin/classes/edu/yuntech/androidmap/R$string.class
	androidmap/bin/classes/edu/yuntech/androidmap/R$style.class
	androidmap/bin/classes/edu/yuntech/androidmap/R$styleable.class
	androidmap/bin/classes/edu/yuntech/androidmap/Schedule.class
	androidmap/bin/classes/edu/yuntech/androidmap/ServerUtilities.class
	androidmap/bin/classes/edu/yuntech/androidmap/Traffic.class
	androidmap/bin/classes/edu/yuntech/androidmap/Web_view.class
	androidmap/bin/dexedLibs/android-support-v4-cd41cdd68db5b173b6ebd29eceb3925c.jar
	androidmap/bin/dexedLibs/gcm-aed057eae63d1697be95e7d5158294ac.jar
	androidmap/bin/dexedLibs/google-play-services-2ba33704fec46fca8efe15714da79ec7.jar
	androidmap/bin/dexedLibs/google-play-services_lib-a94f7a7aa979be9fa33a93cbf063a1b9.jar
	androidmap/bin/jarlist.cache
	androidmap/bin/resources.ap_
	androidmap/gen/com/facebook/android/R.java
	androidmap/gen/edu/yuntech/androidmap/R.java
	androidmap/res/layout/intro.xml
	androidmap/res/values/strings.xml
	androidmap/src/edu/yuntech/androidmap/AndroidMap.java
	androidmap/src/edu/yuntech/androidmap/Intro.java