Added TimetableActivity
Resolved conflict