Update bootstrap/js/bootstrap.js

update to play with merge and rebase