changing structure

added edit_profile, changed show_groups and add_group
Merge remote-tracking branch 'origin/master'