feature 2 twilio changes in var
merge feature 2 further

Conflicts:
	twilio.js