homecontrol
Merge branch 'master' of https://github.com/w821881341/HealthLife

Conflicts:
	HealthSLife/.classpath