Using 'authorize' instead of 'whitelist'
Workaround to handle channels without 'default_affiliation'
Merge pull request #307 from buddycloud/dev-candy

Merge from dev-candy