start work on new template-based reports
Updated osx run env for gdal 1.10
fix messageviewer (fix #685)
adapt proxy.py to SIP API v2 (fix #687)
attempt to fix grid importer tool (#686)
Merge remote-tracking branch 'origin/master'
Bumped test build version
Fix #686 - I used a smarter implementation than 464a636fda767f8f because we want all shakemaps to use the same colour scale so that if two are compared side by side any given mmi intensity will exhibit the same colour.
Fix #686 - Ismall code tidy up.
Bumped test build version
Improved doc string for mmi colour scale
Fix #686 - small code tidy ups.
Added pycharm launcher for osx
Refactored realtime tests into their own package
Imports tidy up
Refactored shakemape importer to be more consistent with coding conventions and re-enabled test_converting test.
Fix #659 Volcano Impact function Error Added unit test and changed coding convention of the function _clip_layer_raster
Fix QSettings based on SIP API Change
Merge branch 'master' of github.com:AIFDR/inasafe
Merge branch 'inasafe-659'