Updated to support Bootstrap3.
Merge branch 'master' into gh-pages

Conflicts:
	angularjs.html
	basic-plus.html
	basic.html
	index.html