user-channels v0.90 added
Merge remote-tracking branch 'origin/Billy2011'