Fixed foreign keys associating a trade to a user as initiator or receiver
Merged layout with local
Merge branch 'master' of github.com:pschwyter/mtg_json_api

Conflicts:
	app/views/layouts/application.html.erb