Add Today's Schedule, ShowcaseView, Refactored ScheduleLoader
Resolve conflicts