calendar fix
Merge branch 'master' into sponsored_events