Merge pull request #1 from AIFDR/develop

Merge Upstream
[HOTFIX] Updated Translation after updating #825.
Fix #825 InaSAFE single branding - fixes for naming convention.
Compiled translation strings.
Fix #839 Make QTextEdit of all the tabs on the about dialog to ReadOnly.
Merge pull request #837 from akbargumbira/develop

Updated Translations for #825 About Dialog
Translation update for about dialog.
Merge pull request #842 from akbargumbira/develop

Translation update for about dialog.
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
Resolved merge conflicts
Updated translation strings
Fix for failing test on jenkins caused by bugfix version change.
Fix for failing test on jenkins caused by bugfix version change.
Updated translations for Bahasa Indonesia
Updated translations for Bahasa Indonesia
Fix for failing test on jenkins caused by bugfix version change.