removed requirement
added creation/combination of events and event overrides
Merge remote-tracking branch 'origin/templates' into event-creation
Added retrieval of all the future events for the user's owned calendars
Merge remote-tracking branch 'origin/event-creation' into templates
have the base listing of the events for all calendars and individual calendars
based rrule on end date to get events that are currently happening
Merge remote-tracking branch 'origin/event-creation' into templates
create_update should store current user as creator, not owner
Updated bootstrap reference
Fix for determining 1 year from current year (for base_instances)