merged
fixed application controller error
Merge branch 'feature/twilio' into develop
fixed and updated devise error with Twilio
Merge branch 'develop' of github.com:Jamalp/ScoutPost into develop
Fixed sms merge issues.