Merge pull request #3 from yandy/master

线性历史
Merge branch 'devel'
Merge pull request #5 from yandy/master

更新活动安排以及相关文档