updates to templates -- added checkboxes/removed unneeded fields
Merge branch 'master' of
https://github.com/davidhickeyicfi/orbis-portlets

Conflicts:
	orbis-consult-portlet/docroot/portlets/patientCase/caseEntryStep1.jsp
Merge branch 'master' of
https://github.com/davidhickeyicfi/orbis-portlets

Conflicts:
	orbis-consult-portlet/docroot/portlets/patientCase/caseEntryStep3.jsp