[mod]IE兼容问题
Merge pull request #64 from wangxu2013/master

[mod]IE兼容问题
Merge branch 'qkhj-master'

Conflicts:
	scapp/templates/index.html
	scapp/templates/xmgl/xmxx.html
Merge branch 'qkhj-master'

Conflicts:
	scapp/templates/index.html
Merge pull request #66 from qkhj/master

modify
Merge pull request #67 from qkhj/master

【modify】密码长度修改
[mod]修正服务器数据库路径
[add]项目管理
Merge pull request #68 from wangxu2013/master

[add]项目管理
Merge pull request #17 from JohnCny/master

merge