CreateDisciplineWindow, CreateClassroomWindow, buttons, new constructors
Merge remote-tracking branch 'origin/unstable' into unstable