merge in newest changes, fix conflict in studygroup.html.erb