change start_week.year to start_date.year
Fixed conference view spec, mismatched end
Merge pull request #230 from differentreality/cfp_weeks

change start_week.year to start_date.year
Merge pull request #236 from gopesht/fix_conference_show_spec

Fixed conference view spec, mismatched end
Adds color to event types