adds the borrowing page
Merge branch 'master' of github.com:clemensp/majordomo

Conflicts:
	Gemfile
	app/controllers/assets_controller.rb
	db/schema.rb