Changes in classse cadLesson, LessonDao and LessonBean.
Merge origin/master
Changes in classse cadLesson, LessonDao and LessonBean.
Merge origin/master
Savar changes to the database cadDiscipline class.