Condensed some template files
Use predefined # of days to display on main calendar view; fixed frontend list/month/year template rendering; force main calendar view to display today's events even if they've already occured
Correctly determine if an event has more than one instance
merged from templates branch