Revert "updating js libs"
fixing rebasing issues and jshint