Production changes
megre trade controller
Merge branch 'master' of https://github.com/sramirezayuso/Fifajalla

Conflicts:
	app/controllers/trades_controller.rb