no change
fixed conflict
fixed conflict
Changed form layout for new rental
Added like to item through barcode
fixed merge conflict
fixed merge conflicts
Added link to item from barcode
Added link to item from barcode
initial commit
Fix merge conflicts
Added limit and max  on renewals
Fix conflicts
merge to master
fixed merges with Gellert's stuff
fixed merge conflicts again