Fixed categorical threshold
Added user configurable threshold
updated resource_rc
merged from origin
Merge branch 'master' of https://github.com/AIFDR/inasafe into fix_categorised_hazard_pop_function
updated resources_rc.py
Fixed failing test on realtime.
Updated realtime to adapt with SIP API changes (QVariant, QInt, QString, QFloat type removal). Now, it can produce the same map report with the older version.
#Realtime. Updated pickle test data after updating ShakeEvent to comply with SIP API changes.
Remove layers from canvas before they get deleted
Merge pull request #741 from assefay/master

Remove layers from canvas before they get deleted - fixes QObject::disconnect console spam when running tests.
Minor docstring cleanups
Get rid of grep checks for Object::disconnect
Merge branch 'master' of https://github.com/AIFDR/inasafe
fix #722 and related building type aggregator issues by updating the scheme
of building grouping. now it uses only the type column as created by the
OSM downloader.
Merged changes from aggregator_wrappers branch - closes and fix #740
Fix issue with keywords db path not being set up properly, causing a traceback error to show for postgresql layers
Code cleanups
Merged fix #726 set defaults for categorical impact function to 1/3, 2/3 and 1.
Fix #742 - DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
Updated strings for translation