added classes for group handling
Merge branch 'master' of https://github.com/lukashaidacher/ThinkingCO2.git