Merge pull request #1 from Jensyn/master

pull
修改user.class.php
Merge pull request #39 from qq53/master

修改user.class.php
Merge pull request #40 from Crabbit/master

lili完善readme，整理文件
改好user.class.php
改好user.class.php
数据库的最新修改及文档说明
修改了.gitignore
Delete scope_settings.xml
Delete .name
Delete cs-xiyoulinux.iml
Delete encodings.xml
Delete misc.xml
Delete modules.xml
Delete vcs.xml
Delete workspace.xml
数据库cs_updata_info增加一个属性
Merge branch 'master' of https://github.com/wangduoxiong/cs-xiyoulinux
Update db_cs.sql
Merge pull request #42 from wangduoxiong/master

数据库的最新修改及文档说明