Fix channels
Merge branch 'master' of github.com:catarse/catarse