Merge pull request #3 from hershal/production

Merged production
Merge pull request #2 from hershal/master

Agenda and typos
updated calendar.js for gcal 3.0

Great timing (sarcasm)
Merge branch 'master' into production