Category/Tag front-facing event list CBVs
Merge in event list cbv changes