added jshint
fixed hinting erros
Merge branch 'master' into gh-pages
update