修改20140608显示
Merge branch 'dev' into gh-pages