no message
Merge branch 'Search' of https://github.com/SmartDental-ASD/SmartDental-ASD into Search

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/SmartDental.apk
	bin/classes/com/edu/thss/smartdental/AppointmentFragment.class
	bin/classes/com/edu/thss/smartdental/ClassFragment.class
	bin/classes/com/edu/thss/smartdental/DataFragment.class
	bin/classes/com/edu/thss/smartdental/EMRFragment$1.class
	bin/classes/com/edu/thss/smartdental/EMRFragment.class
	bin/classes/com/edu/thss/smartdental/EMRTabAllFragment.class
	bin/classes/com/edu/thss/smartdental/HomeFragment.class
	bin/classes/com/edu/thss/smartdental/ImageFragment$1.class
	bin/classes/com/edu/thss/smartdental/ImageFragment.class
	bin/classes/com/edu/thss/smartdental/ImgTabAllFragment.class
	bin/classes/com/edu/thss/smartdental/InfoFragment.class
	bin/classes/com/edu/thss/smartdental/MainActivity.class
	bin/classes/com/edu/thss/smartdental/MyTestActivity.class
	bin/classes/com/edu/thss/smartdental/OneEMRActivity.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/R$id.class
	bin/classes/com/edu/thss/smartdental/R$layout.class
	bin/classes/com/edu/thss/smartdental/R$menu.class
	bin/classes/com/edu/thss/smartdental/R$raw.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/SettingFragment.class
	bin/classes/com/edu/thss/smartdental/Tooth2DFragment.class
	bin/classes/com/edu/thss/smartdental/ToothFragment$1.class
	bin/classes/com/edu/thss/smartdental/ToothFragment.class
	bin/classes/com/edu/thss/smartdental/ToothObjectFragment.class
	bin/classes/com/edu/thss/smartdental/ToothPermanentFragment$1.class
	bin/classes/com/edu/thss/smartdental/ToothPermanentFragment$TreeViewAdapter.class
	bin/classes/com/edu/thss/smartdental/ToothPermanentFragment.class
	bin/classes/com/edu/thss/smartdental/ToothPrimaryFragment$TreeViewAdapter.class
	bin/classes/com/edu/thss/smartdental/ToothPrimaryFragment.class
	bin/classes/com/edu/thss/smartdental/adapter/AppointListAdapter.class
	bin/classes/com/edu/thss/smartdental/adapter/EMRListAdapter.class
	bin/classes/com/edu/thss/smartdental/adapter/ImgListAdapter.class
	bin/classes/com/edu/thss/smartdental/ui/calendar/SlideView.class
	bin/classes/com/edu/thss/smartdental/ui/drawer/NavDrawerListAdapter.class
	gen/com/edu/thss/smartdental/R.java
	res/values/strings.xml