fixed logout issue
Merge branch 'twilio_tweeks'