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

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