bug fix for ordering groups
Merge branch 'master' of https://github.com/cashsun/fightclub
I guess this time it's stable...