Merge branch 'feature/error-is-method' into develop
Merge remote-tracking branch 'upstream/master' into develop
add jshint settings
fix jshint errors - close #161 and #162
current project spacing schema
avoid possible context problem with onWaiting
Merge pull request #163 from dcharbonnier/feature/jshint

Feature/jshint