Updated rounding
Updated the volcano evecuation IF
Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding

Conflicts:
	safe/impact_functions/inundation/flood_population_evacuation_raster_hazard.py
Update after merge also changed 'to' to 'up to'
Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding
Update tests
tests updated
Fixing tests
Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding
Fixed safe_qgis side tests
test_map seems to be a bit random...
incorporated Ismail's comments
Merge pull request #1282 from cchristelis/inasafe-1239-population-rounding

Inasafe 1239 population rounding
make test
Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard