added saving of group and cleaned up code

Author René Welbers <git@gecko-development.com>
Author date 2016-01-27 13:29:40
Author local date 2016-01-27 14:29:40 +0100
Committer René Welbers <git@gecko-development.com>
Committer date 2016-01-27 13:29:40
Committer local date 2016-01-27 14:29:40 +0100
Commit dad14657a44d4c799098a130d2ec0488f81b5c6e
Tree 9303e5920bb9ed8e1e2771d0521f78fd8306bc40
Parent b6ebb7d964ffbf0454be9c537b43e9ae1696f765
added saving of group and cleaned up code