Moved categorised functions to test-only area
Updated tests to reflect categorised impact functions moved to test-only area
[BACKPORT]Added warning dialog for when upgrading plugin.
Merge branch 'master' of github.com:AIFDR/inasafe
Merge futher fixes for issue #463
Added change log from 1.1
[BACKPORT] Pylint fixes
Removed unneeded pass statement
Fixed indentation error
Fix pylint formatting error
Back ported memory check function from 1.1 branch
Fix off by one issue in cities table colouring
Change to Australia-Indonesia in translation.
set INASAFE_LOCAL to id
Merge remote-tracking branch 'origin/master'
Resolved merge conflicts
PEP8
Added osx run wrapper for make
Estimate of people evacuated as a userdefined percentage
Added missing changelog for flood impact