make Glyphicons mainstream in Carousel examples
Merge branch 'master' into carousel-glyphicons-mainstream

Conflicts:
	javascript.html