Fixed Save-Bug of Timetable
merged changes