Merge pull request #1 from cloudmonkeypeng/master

Added  some base js and css
Merge pull request #2 from cloudmonkeypeng/master

增加登陆页面，已调整好字体与.ico
log
Merge pull request #1 from fengye92/master

merge test