Groups done.  Public and private groups can be created.
Bug fixes after merge.