added teacher support
(adding, editing, polls)
adjusted order in subject_question