Zhongyangxin
Merge branch 'master' of https://github.com/zhongyx12/SmartDental_Combine

Conflicts:
	AndroidManifest.xml
	lint.xml
	project.properties
	res/values/arrays.xml
	res/values/strings.xml