Merge commit '0f014b4471d884b3925068aabb30c88c614598dd'

Conflicts:
	libsmo/model/smo.mwb
	libsmo/src/course.cpp
	libsmo/src/lesson.cpp
	libsmo/src/subject.cpp