Actually finish the channel_groups filter
Copy ChannelGroup before filtering numberings by genre, because immutability is nice.
Merge branch 'mbst-9629-channel-genres' into stage

Conflicts:
	src/main/java/org/atlasapi/query/v2/ChannelGroupController.java