more tests more fixes
Merge branch 'sp_modellist' of github.com:zhdk/leihs into sp_modellist

Conflicts:
	app/assets/javascripts/_NEW/borrow/controllers/models_index_tooltip_controller.coffee