timetable and lecture
merge branch2
correct strings.xml