feature:
hitachi report
Merge branch 'master' of github.com:aronezhang/ironmine
Merge branch 'master' of github.com:aronezhang/ironmine
Fixed:
文件夹管理读写权限分离
Fixed:
修正文件夹功能的一些翻译缺漏以及get_data中的搜索功能
解决知识库中创建新Article时存在的bug
监控平台：添加邮件模板的英文翻译
忽略ruby-version
Merge branch 'feature/mtb' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine into feature/mtb
添加监控图表选取时间范围功能
监控平台：以host为单位成批次发送service状态改变的提醒邮件
Merge branch 'feature/mtb' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine into feature/mtb
Merge branch 'master' into feature/mtb

Conflicts:
	modules/30_knowledge_skm/config/locales/en.yml
监控平台：html格式邮件模板，修复host在定时执行时被过滤bug
Merge branch 'feature/mtb' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine into feature/mtb
知识库：解决创建文章时选择上一步或下一步报出404的bug
Merge branch 'master' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine
修正知识库新建知识无法回退的bug
监控平台：根据用户语系发送邮件警告(存在bug)
Merge branch 'master' of http://hismsdev.hand-china.com/gitlab/hailor/ironmine

Conflicts:
	modules/30_knowledge_skm/app/views/skm/entry_headers/new_step_2.html.erb