reorganize bootstrap scaffolding on loan detail page
Merge branch 'master' into working copy

Conflicts:
	app/assets/stylesheets/application.css
	app/views/loans/show.html.erb