runClient
Merge branch 'master' of https://github.com/pkxiuluo/healthlife

Conflicts:
	HealthSLife/src/com/healthslife/run/RunClient.java