added required variables for editing subjects
Merge remote-tracking branch 'origin/master'