Don't add PaginationRedirectMixin on UpcomingEventsListView
Merge remote-tracking branch 'origin/master'
Added templatetag to replace built-in url templatetag to handle main calendar url names
Added url templatetag override to templates that reference a calendar url