vorlagen.feature:32
Merge branch 'sp_borrow_template' of github.com:zhdk/leihs into sp_borrow_template

Conflicts:
	features/step_definitions/borrow/vorlagen_steps.rb