2011-09-11 cli Fix for #14
2011-09-11 cli Merge Channel and Group classes.