[fix] email field for teachers
Merge branch 'master' of github.com:bwhthd/Journal
[fix] java script errors
Merge branch 'master' of github.com:bwhthd/Journal