Added group management to the project
fixed merge conflict with app.js