Merge branch 'master' of https://github.com/youfeng/healthyside.git

Conflicts:
	client/healthyside-android/.gitignore

Signed-off-by: max <mytherf@gmail.com>