allow border_width in vector styles
Merge branch 'master' into categorical_hazard_data

Conflicts:
	safe_qgis/utilities/styling.py
added border_width