Merge pull request #742 from hegek87/havoc

Group manage page partially implemented
Merge remote-tracking branch 'upstream/havoc' into havoc