Fix bootstrap
fix bootstrap
Merge branch 'master' into blog

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss