new groups added, friends added and deleted
Merge branches 'master' and 'manageGroupsjsp'