Merge branch 'Favorites'

Conflicts:
	.idea/workspace.xml
Merge branch 'Favorites'

Conflicts:
	.idea/workspace.xml