work in form login refactor2
Merge remote-tracking branch 'origin/master'