Added aggregation to rise coverage.
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Updated metadata for the release of 2.0
Added tests for safe.
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
allow to pass custom qgis install location to runenv-linux.sh
Conflicts:
	run-env-linux.sh
Merge branch 'master' of github.com:AIFDR/inasafe
Added test for impact_functions/styles.py
Fixed pylint violations.
Edited checksum.
Update README.md
Update README.md
Added missing license files
Removed organizations logos and made custom logo show up in dock if set
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
PyLint fixes.
Fix pylint errors
Ignore logging using string interpolater warning in pylintrc
made org_logo as wide as dock
Update sha for make data audit