fixed safe_qgis.impact_statistics.test.test_aggregator:AggregatorTest.test_aggregate_vector_impact
Merge branch 'master' into inasafe_qgis2
fix batch runner tests
update test_init.py to validate only metadata.txt
add missed coding string
Use breakdown_defaults instead of defaults() to avoid name conficts
Allow docs dir
Added user docs to main repo
Remove expected failure from native zstats test
Underscore separate batch file names by default.
Show tracebacks by default
Merge branch 'master' into inasafe_qgis2

Conflicts:
	safe_qgis/ui/resources_rc.py
	safe_qgis/widgets/dock.py