added new styles to view pages
Merge branch 'master' of github.com:clemensp/majordomo

Conflicts:
	app/views/assets/borrowed_status.html.erb
	app/views/assets/show.html.erb
fixed some stuff