Merge pull request #1 from pepoc/master

wanglei
wanglei modify
add png
Merge pull request #2 from resJson/master

modify login