就诊通知
detached head
Merge branch 'master' of
git@github.com:MediFamily/PersonalDoctorbutler.git

Conflicts:
	AndroidManifest.xml
add smt
Merge branch 'master' of
git@github.com:MediFamily/PersonalDoctorbutler.git

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/medishare/activity/LoginActivity.java
	src/com/medishare/activity/RegisterActivity.java