conversion controller working
Merge branch 'twilio-api' of https://github.com/sam-strong/twillex into twilio-api
Merge branch 'twilio-api' into develop

Conflicts:
	spec/controllers/exchanges_controller_spec.rb