code format，jshint
jshint
Merge branch 'master' into gh-pages