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