merged teacher-interface branch with current master