updated calendar.js for gcal 3.0

Great timing (sarcasm)
forgot to resolve this conflict
Merge branch 'master' into production