cleaned up smallgroups pages
fixed merge conflicts
Merge branch 'ccmolitoris-master'