added edit button back
Merge branch 'edit_studygroup' of https://github.com/dkumar/MeetMyClassmates into edit_studygroup
Fixed test errors, added edit button