Calendar code

Also needed to update dojo to get a bug fix for jsonp and lodash for some other features - so large commit