Merge branch 'master' into develop
case 3082 - Converting availability text to links pointing either to objects or collection.
case 3108 - Reserve-button on collection to choose object.
case 3082 - Correcting links so that they link either to collections or objects.
Merge branch 'case-3108' into easy
case 3111 - Display the availability.
Merge branch 'case-3111' into easy
Merge remote-tracking branch 'origin/case-3082' into easy
case 3111 - Minor changes to availability insertion logic.
Merge branch 'case-3111' into easy
case 3108 - Recommit changes
Merge branch 'case-3108-2' into easy

* case-3108-2:
  case 3108 - Recommit changes
Merge remote-tracking branch 'origin/case-3082' into easy
Merge remote-tracking branch 'origin/case-3111' into easy
case 3108 - Recommit changes
Merge branch 'easy' of github.com:artesis/ding_availability into easy

* 'easy' of github.com:artesis/ding_availability:
  case 3108 - Recommit changes
Merge branch 'case-3108' of github.com:artesis/ding_availability into case-3108

* 'case-3108' of github.com:artesis/ding_availability:
  case 3108 - Reserve-button on collection to choose object.
Merge branch 'easy' into case-3108

* easy:
  case 3108 - Recommit changes
  case 3108 - Recommit changes
  case 3111 - Minor changes to availability insertion logic.
  case 3111 - Display the availability.
  case 3082 - Correcting links so that they link either to collections or objects.
  case 3082 - Converting availability text to links pointing either to objects or collection.
case 3108 - Fix: holdings table was not shown.