edit favorites creating
Merge branch 'groups'