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