kalendar.feature:120
Merge branch 'sp_borrow_calendar' of github.com:zhdk/leihs into sp_borrow_calendar

Conflicts:
	features/step_definitions/borrow/kalendar_steps.rb