Fixed merge conflict
Merge branch 'master' of https://github.com/helloworld/Doctorkit

Conflicts:
	client/messagepatient.html