Added query and bootstrap.js support