fix
fix
Merge branch 'master' of https://github.com/leoncool/healthbook.git

Conflicts:
	.settings/org.eclipse.wst.common.project.facet.core.xml
Merge branch 'master' of https://github.com/leoncool/healthbook

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/leoncool/healthbook.git
fix