Fix #825 InaSAFE single branding - fixes for naming convention.
Fix #825 InaSAFE single branding - Updated authors string in metadata.
Fix #825 InaSAFE single branding - Replaced icon seen in plugin manager.
Fix #825 InaSAFE single branding - added option for whether to show organisation logo in dock. Default logo to BNPB logo. Layout tweaks for dock.
Resolved merge conflicts
Merge pull request #844 from timlinux/inasafe-825

Inasafe 825