Update CALENDAR.md
Update CALENDAR.md
Merge pull request #775 from html5rocks/master

Merge master to live so the latest scripts are present.
Merge pull request #776 from html5rocks/master

Merging to live
Merge pull request #777 from html5rocks/master

Merging translations to live.
Merge pull request #779 from html5rocks/master

Merging master to live to pick up Sam's changes.
Merge pull request #782 from html5rocks/master

Merging translations to live and article
Merge pull request #786 from html5rocks/master

Merging master to live for Paul Irish's article.
Merge pull request #803 from html5rocks/master

Merging the new article structure and translations to live
Merge pull request #804 from html5rocks/master

Update CONTRIBUTING.md
Merge pull request #808 from html5rocks/master

Merging master to live.  There are a huge number of changes to images
Merge pull request #814 from html5rocks/master

Merging multiple translations
Merge pull request #824 from html5rocks/master

Merging to live
disabled "safe" flag on title and description meta tags
Merge remote-tracking branch 'upstream/master' into enable_escape
Merge pull request #828 from html5rocks/master

Merging some hobbits fixes and user timing article
Merge pull request #832 from html5rocks/master

Merge to live
Merge pull request #835 from html5rocks/master

Merging some images to live
Merge pull request #837 from html5rocks/master

Adds Promises article and SNOW!
Merge branch 'live' of https://github.com/html5rocks/www.html5rocks.com