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