Updated logo for #1339
Updated options dialog to move org logo option to first panel, and default to off. See #1339
fix failing test on travis
Merge remote-tracking branch 'upstream/develop' into issue-1339
Resolved merge conflicts
Regenerated broken resources file
merged from master
Regenerated resources file
Merge pull request #1348 from timlinux/issue-1339

Sponsors logo branding update as per issue #1339
Remove in progress IF from Christian