乱码处理
Merge branch 'master' of https://github.com/wangyh-thss/SmartDental_merged

Conflicts:
	bin/classes/com/edu/thss/smartdental/AddManyFragment$1.class
	bin/classes/com/edu/thss/smartdental/AddOneFragment$1.class
	bin/classes/com/edu/thss/smartdental/AdminActivity.class
	bin/classes/com/edu/thss/smartdental/AllPatientActivity$2$1.class
	bin/classes/com/edu/thss/smartdental/AllPatientActivity$2.class
	bin/classes/com/edu/thss/smartdental/BBSInTabManageFragment$1.class
	bin/classes/com/edu/thss/smartdental/BBSInTabPostFragment$1.class
	bin/classes/com/edu/thss/smartdental/ChangePasswordActivity$1.class
	bin/classes/com/edu/thss/smartdental/EMRTabAllFragment.class
	bin/classes/com/edu/thss/smartdental/EditBasicInfoActivity$1.class
	bin/classes/com/edu/thss/smartdental/EditBasicInfoActivity.class
	bin/classes/com/edu/thss/smartdental/InfoFragment$4.class
	bin/classes/com/edu/thss/smartdental/InfoFragment.class
	bin/classes/com/edu/thss/smartdental/LoginActivity$1.class
	bin/classes/com/edu/thss/smartdental/LoginActivity$2.class
	bin/classes/com/edu/thss/smartdental/OneEMRActivity.class
	bin/classes/com/edu/thss/smartdental/OneImageActivity$3.class
	bin/classes/com/edu/thss/smartdental/OneImageActivity.class
	bin/classes/com/edu/thss/smartdental/OnedayAppointActivity.class
	bin/classes/com/edu/thss/smartdental/OnedayAppointChartFragment.class
	bin/classes/com/edu/thss/smartdental/OnedayAppointListFragment.class
	bin/classes/com/edu/thss/smartdental/PostBBSActivity$1.class
	bin/classes/com/edu/thss/smartdental/PostBBSActivity.class
	bin/classes/com/edu/thss/smartdental/PostReplyActivity.class
	bin/classes/com/edu/thss/smartdental/R$string.class
	bin/classes/com/edu/thss/smartdental/R$style.class
	bin/classes/com/edu/thss/smartdental/RegisterActivity$1.class
	bin/classes/com/edu/thss/smartdental/RegisterActivity$2.class
	bin/classes/com/edu/thss/smartdental/RemoteDB/HttpConnSoap.class
	bin/classes/com/edu/thss/smartdental/Tooth2DFragment$1.class
	bin/classes/com/edu/thss/smartdental/ToothPermanentFragment$1.class
	bin/classes/com/edu/thss/smartdental/ToothPermanentFragment.class
	bin/classes/com/edu/thss/smartdental/ToothPrimaryFragment$1.class
	bin/classes/com/edu/thss/smartdental/ToothPrimaryFragment.class
	bin/classes/com/edu/thss/smartdental/adapter/AppointListAdapter$1.class
	bin/classes/com/edu/thss/smartdental/adapter/BBSDetailAdapter$BBSFilter.class
	bin/classes/com/edu/thss/smartdental/adapter/BBSDetailAdapter$buttonViewHolder.class
	bin/classes/com/edu/thss/smartdental/adapter/BBSDetailAdapter$collectButtonListner.class
	bin/classes/com/edu/thss/smartdental/adapter/BBSDetailAdapter$deleteButtonListner.class
	bin/classes/com/edu/thss/smartdental/adapter/BBSDetailAdapter$replyButtonListner.class
	bin/classes/com/edu/thss/smartdental/adapter/BBSDetailAdapter.class
	bin/classes/com/edu/thss/smartdental/adapter/EMRListAdapter.class
	bin/classes/com/edu/thss/smartdental/adapter/ImgListAdapter$HandleAfterPost.class
	bin/classes/com/edu/thss/smartdental/adapter/ImgListAdapter.class
	bin/classes/com/edu/thss/smartdental/adapter/ToothPageAdapter.class
	bin/classes/com/edu/thss/smartdental/model/general/HttpGetProcess$2.class
	bin/classes/com/edu/thss/smartdental/model/general/HttpPostProcess$2.class
	bin/classes/com/edu/thss/smartdental/model/tooth/Tooth.class
	bin/classes/com/edu/thss/smartdental/model/tooth/ToothGraphic.class
	bin/classes/com/edu/thss/smartdental/ui/calendar/AppointmentChartView.class
	bin/classes/com/edu/thss/smartdental/ui/calendar/CalendarSurface.class
	bin/classes/com/edu/thss/smartdental/ui/calendar/CalendarView.class
	bin/classes/com/edu/thss/smartdental/ui/calendar/SlideView.class
	bin/classes/com/readystatesoftware/viewbadger/BadgeView.class
	gen/com/edu/thss/smartdental/R.java