second commit
third commit
Merge branch 'master' of github.com:luoxinvszm/lsq
loginAction modified