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