Merge branch 'development'
updates calendar links
Merge branch 'master' into development