aaa
commit by geng
Merge branch 'master' of https://github.com/SmartDental/toothhome

Conflicts:
	sd_geng/bin/classes.dex
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleDetailFragment$1.class
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleDetailFragment$2.class
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleDetailFragment$3.class
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleDetailFragment.class
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleFragment$1.class
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleFragment$2.class
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleFragment$3.class
	sd_geng/bin/classes/com/edu/thss/smartdental/ScheduleFragment.class
	sd_geng/bin/classes/com/edu/thss/smartdental/Toothhome$1.class
	sd_geng/bin/classes/com/edu/thss/smartdental/Toothhome.class
	sd_geng/bin/resources.ap_
	sd_geng/src/com/edu/thss/smartdental/ScheduleDetailFragment.java
	sd_geng/src/com/edu/thss/smartdental/Toothhome.java