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