Merge pull request #2 from AIFDR/develop

Merge upstream
Merge pull request #846 from timlinux/develop

Fix failing jenkins tests
application translation
Use QTextBrowser for Supporter tabs and set as external link.
Merge branch 'develop' of github.com:akbargumbira/inasafe into develop
Changed the name of QTextBrowser to supporters_text.
screenshots update
Merge remote-tracking branch 'origin/master' into develop
Set tab default correctly in about box
Merge pull request #849 from timlinux/master

Merge changes from develop ready for 2.0.2 release