REFACTORING

Conflicts:
	app/assets/javascripts/_NEW/borrow/lib/booking_calendar_dialog.coffee
	app/assets/javascripts/angularjs/templates/options/edit.html.haml
	db/structure.sql
	features/step_definitions/borrow/kalendar_steps.rb