temp
Merge branch 'master' of https://github.com/SmartDental/toothhome

Conflicts:
	sd_geng/.classpath
	sd_geng/bin/SmartDental.apk
	sd_geng/bin/classes.dex
	sd_geng/bin/resources.ap_
	sd_geng/library/bin/library.jar