diagnosis lookup
Merge branch 'master' of
https://github.com/davidhickeyicfi/orbis-portlets

Conflicts:
	orbis-consult-portlet/docroot/WEB-INF/src/org/cybersight/consult/mvc/controller/patientcase/PatientCaseController.java