Fixed bug in accept_trade action in Trades controller
Merge branch 'master' of github.com:pschwyter/mtg_json_api
Dropped obsolete tradeable_cards and wanted_cards tables
Removed multiverseid from displaying with card, fixed card search so that query returns activerecord object
Merge branch 'master' of github.com:pschwyter/mtg_json_api

Conflicts:
	app/controllers/cards_controller.rb