Changed user and group model
Group and user interaction
fixed merge conflict with schema