增加文件上传区分文件夹功能
忽略文档
文件管理添加文件夹功能：英文翻译/初始化权限
监控平台：解决scheduler不定时执行，用模板分别展现各service状态
Merge branch 'feature/mtb' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine into feature/mtb

Conflicts:
	modules/170_monitor_base_mtb/lib/mtb/scheduler.rb
Merge branch 'feature/mtb' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine into feature/mtb
监控平台：修改展示模板，用模板分别展现各service状态
监控平台：修改check_apache页面
删除空白的helper,减少代码量
删除空白的helper,减少代码量
Merge branch 'feature/mtb' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine into feature/mtb
修改启动脚本
修改启动脚本
修改启动脚本
修正cascade select 在IE10中无法选择空值的bug
添加文件导入/导出权限
Merge branch 'master' into feature/mtb
Merge branch 'feature/folder' into feature/mtb

Conflicts:
	.gitignore
	modules/30_knowledge_skm/config/locales/zh.yml
Merge branch 'feature/folder' of github.com:aronezhang/ironmine into feature/folder
修正文件权限及文件名称搜索问题