Added MyGroupsActivity
Resolved conflicts