修复20140616格式错误
Merge branch 'dev' into gh-pages