Merge branch 'release/1.0.2' into develop
fix test module file name reference
Merge branch 'develop'
Update CHANGELOG.md
add canvas request support
add watch task
change ver to 1.1.0, add changelog
Merge branch 'release/1.1.0'
Merge branch 'master' of github.com:jsforce/jsforce

Conflicts:
	CHANGELOG.md
Merge branch 'master' into gh-pages
regenerate