20140717修复显示问题
Merge branch 'dev' into gh-pages