Merge pull request #674 from hegek87/havoc

Working on group account page