Merge pull request #14 from JohnCny/master

merge
【add】报销邮件提醒
Merge pull request #60 from wangxu2013/master

[merge]
Merge pull request #15 from JohnCny/master

merge
Merge pull request #63 from wangxu2013/master

[mod]页面布局修改
Merge pull request #16 from JohnCny/master

merge
Merge pull request #64 from wangxu2013/master

[mod]IE兼容问题
【add】报表、项目管理
Merge branch 'qkhj-master'

Conflicts:
	scapp/templates/index.html
	scapp/templates/xmgl/xmxx.html