getServer
Merge branch 'master' of github.com:stefaniexin/smartdental

Conflicts:
	bin/classes.dex
	bin/resources.ap_
	bin/sd.apk
serverMessage