Updated several views for Bootstrap 3.1, but the process is not yet complete.
Updated several views for Bootstrap 3.1, but the process is not yet complete.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/bootstrap_leather/_navbar.html.haml