added password to edit forms
bugfixing classroom email form
merge