Added glyphicons fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/_miscellaneous.css.scss
	app/assets/stylesheets/application.css
	app/assets/stylesheets/custom.css.scss
	vendor/assets/stylesheets/bootstrap.css
Fixed gemfile merge