Worked on groups
Edited groups and messages
Edited groups and messages
Cleanup of merge conflicts