20140805调整显示
Merge branch 'dev' into gh-pages