20140806修改语句的表达
Merge branch 'dev' into gh-pages