tweaks to priyanks nosandbox calendar app
fix merge problems
Merge branch 'master' of https://github.com/Polymer/labs