Merge pull request #688 from hegek87/havoc

Changed file names in account/groups and account/profile