Updated Visit Summary and FacePage
Merge branch 'master' of https://github.com/I-TECH/openmrs-module-kenyaemr

Conflicts:
	omod/src/main/webapp/resources/htmlforms/hiv/moh257FacePage.html
resolved confilct
updated face page
Merge pull request #125 from Werick/master

Resolving conflicts