added border_color
allow border color in vector styles
Merge branch 'master' into categorical_hazard_data