cleanup items for form elements
Merge branch 'master' of https://github.com/davidhickeyicfi/orbis-portlets
updates/bug fixes
Merge branch 'master' of https://github.com/davidhickeyicfi/orbis-portlets
Merge branch 'master' of
https://github.com/davidhickeyicfi/orbis-portlets

Conflicts:
	orbis-consult-portlet/docroot/portlets/dashboard.jsp

	
	Plus many updates