Fix for #831 Panel Formatting Error
Merge pull request #833 from timlinux/inasafe-831

Fix for #831 Panel Formatting Error
[HOTFIX] Fix #834 QRegExpValidator needs reference to the element regex will be applied into.
In progress fix for #825 InaSAFE single branding - added about box. Bumped version to 2.0.2. Fixed project description in metadata.txt. Fixed project description in README.
Resolved merge conflicts
In progress fix for #825 reverted inadvertant changes to shakemap importe.
In progress fix for #825 fixed typo in metadata.txt mangers to managers
In progress fix for #825 fixed typo in README.md mangers to managers
In progress fix for #825 logo update
Merge pull request #835 from akbargumbira/develop

[HOTFIX] Fix #834 QRegExpValidator needs reference to the element regex will be applied into
Merge remote-tracking branch 'origin/develop' into inasafe-825
Merge pull request #836 from timlinux/inasafe-825

Added about box. Bumped version to 2.0.2. Fixed project description in metadata.txt. Fixed project description in README.
[#703 Keywords creation wizard] First version
Merge branch 'develop' of github.com:AIFDR/inasafe into wizards

Conflicts:
	safe_qgis/ui/resources_rc.py
[#703 Keywords creation wizard] pep8 and pylint compliant