added google calendar, twilio and sendgrid integration
fixed conflicts