Merge branch 'master' into develop
fiddling with twilio and pushing for Zahid
can receive and send SMS, with learning tests
merge changes
twilio stuff
twilio can send messages on welcome
creating user factory
deleted twilio model
deleted twilio model
merge twilio-api into develop
stuff
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
Merge branch 'develop'
Fixed merge conflict