fixing conflicts
New Group email working
fixed re-direct problem
cleaning groups up
quickly added a redirect after creating a group
fixed mailers and added description
styling changes to groups
paperlcip working with s3 sydney server
added invite feature back with cancan
merge
Delete index.html.erb
removed index.html from groups
added delete function for groupmembers
Merge remote-tracking branch 'upstream/master' into social
fix conflict merge