local changes
Merge branch 'master' of https://github.com/asayko/grand_challenege2013
some refactoring. Add gengroups