Merge branch 'channel_grouping' into 'master'
Channel grouping
Closes #29
See merge request hej/HEJ!70