Fix Group Sorting
Merge remote-tracking branch 'origin/feature/groups' into feature/groups

Conflicts:
	brave/core/group/template/group.html