Merge branch 'master' into development
case 3297 - Display availability information regardless item is on loan.
Merge branch 'hotfix'