revise scala map to fold
teacher should login via login.do
Merge branch 'master' into prod