Filter river by channel

* River view filtered to display drops matching the selected channels.
Merge branch 'integration-dev' into rivers-ui-dev

Conflicts:
	themes/default/media/js/drops.js