导航栏添加论坛
Merge branch 'master' of github.com:henryyan/henryyan.github.com

* 'master' of github.com:henryyan/henryyan.github.com:
  Update 2013-04-05-activiti-5-12-x.md
  Update about.textile