Merge pull request #199 from leider/master

small stuff only
hotfix for grouptable in administration
Merge pull request #200 from leider/master

new way of persistence