seperated event, teams and job
edited show page
resolve conflicts
bring in missing methods for event model from event_templates branch