iMac work
Merge branch 'master' of github.com:clil16/etrack2

Conflicts:
	app/controllers/loans_controller.rb
	app/views/devices/index.html.erb
Fixed conflicts