Adding group to activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/modules/sportivity/views/edit-group.client.view.html