added eslint to lib dir, fixed lint errors
Merge remote-tracking branch 'origin/master'