20140803修改花括号的显示
Merge branch 'dev' into gh-pages