classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	samples/com.ibm.sbt.samples.commons/.classpath
Fix duplicate entry
Fixes for the build/nModify package.json/nAdd _config.js
Merge remote-tracking branch 'origin/master'
Merge pull request #1066 from CarlosManias/js-build-related-fixes

Js build related fixes