merge conflict
merge conflict
restyle river status, add missing colours, add status_description
Merge pull request #57 from ox-it/river-status-cleanup

River status cleanup