Signed-off-by: Haozi Leung <haozileung.cn@gmail.com>
Merge branch 'master' of git@github.com:haozileung/CowHealth.git

Conflicts:
	.gwt/.gwt-log

Signed-off-by: Haozi Leung <haozileung.cn@gmail.com>