fixed test_checkPostProcessingLayersVisibility
Merge branch 'master' of github.com:AIFDR/inasafe
removed unneeded call to accept KW dialog
Fix pylint error and added encoding to file
Got rid of redundant brackets
move crs constructor outside loop
Make test full run pass
Jenkins test fixes
Merge branch 'master' into inasafe_qgis2

Conflicts:
	safe_qgis/impact_statistics/zonal_stats.py
	safe_qgis/widgets/test/test_dock.py
port map_legend.py and corrresponding test (still need to rewrite one
test)
fix last test for map_legend
port map.py to qgis2