Testing
Merge branch 'master' of https://github.com/orangedog22/dealfish

Conflicts:
	Resources/favorites/favorites.js
	Resources/list/list.js
	Resources/search/search.js
	Resources/settings/settings.js