conflict updates
Merge branch 'master' of https://github.com/davidhickeyicfi/orbis-portlets
Merge branch 'master' of https://github.com/davidhickeyicfi/orbis-portlets
updates for search/dash