move twilio nad sendgrid from live.js to report.js
fix merge conflicts