favorites color fixes
Merge branch 'master' of https://github.com/orangedog22/dealfish

Conflicts:
	Resources/favorites/favorites.js