school db update
redo login pswd
Merge branch 'dev_tim'