Merge pull request #127 from pengqin/dev

Dev
revert code
Merge pull request #139 from hopesfish/dev

login code