Merge branch 'Hjelm-givakt'
Add project channels