Small fabric fix
Merge remote-tracking branch 'origin/master'
#654 Aggregation results are correct using native QGIS zonal stats fails on windows - skip test under windows for now.
Updated context help docs
Fix #655 Shakemap importer dialog needs a help button
Fix #656 Batch runner needs a context help button
Fix #657 OSM Downloader needs a context help button
Fix failing test caused by changes made for #655
Change small text string
Merge branch 'master' into inasafe_qgis2

Conflicts:
	safe_qgis/tools/shakemap_importer.py
	safe_qgis/ui/resources_rc.py
fix merge conflicts
fix some pep8 and pylint violations