Add link text and icons for saving/removing from favorites
allow user to save and remove favorites
switch to using a form to save favorites so it works without javascript
add some intergration tests for favorites
Style the favorites button so it looks and behaves like the other action links
Fix merge conflict

Conflicts:
	app/views/catalog/_show_collection_member.html.erb
	app/views/saved_items/_favorites_link.html.erb
Fix merge conflict again