Updating bsDemo()
test
Merge branch 'master' of https://github.com/ebailey78/shinyBS

Conflicts:
	inst/examples/demo/server.R
	inst/examples/demo/ui.R
	inst/examples/demo/www/demo.css
	inst/www/shinyBS.js