added bootstrap.js
smaller changes
Merge remote-tracking branch 'origin/master'

* origin/master:
  changed url to git repo
  moved to latest versions of npm modules in package.json

Conflicts:
	package.json