Merge pull request #3 from jiangteng/master

pull
基本框架 2014 -- 10 -- 24
 2014--10--26

连接数据库登录，界面优化
2014--10--27

修复部分bug
Merge pull request #10 from dlz225/master

Merge pull request #3 from jiangteng/master
Merge pull request #4 from jiangteng/master

11