More fallback checks for format in MultipleFormatTemplateViewMixin (fixes main calendar '/' view)
Fixed js widget
Merge in calendar widget