js
Merge branch 'master' of https://github.com/lockheedman/html

Conflicts:
	js/plugins/bootstrap/all.js
js update