Adding Intent
Update Intent
Merge branch 'master' into calendar-edits