继续修复20140611尖括号显示问题
Merge branch 'dev' into gh-pages