Modifying the collection display to add Collection information.
Changes for new Collection page display.
Merge branch '7.x-collection-page' of https://github.com/uml-digitalinitiatives/UofM-Theme_2 into 7.x-collection-page

# Via root
* '7.x-collection-page' of https://github.com/uml-digitalinitiatives/UofM-Theme_2:
  Modifying the collection display to add Collection information.

Conflicts:
	templates/islandora-basic-collection-wrapper.tpl.php
CSS changes to Collections page
Fixing thumbnail display on homepage.
Merge branch '7.x-collection-page' of https://github.com/uml-digitalinitiatives/UofM-Theme_2 into 7.x-collection-page
Changes to correct menu display issues with Chrome. Line-height was too large
and caused the floating objects to stack.
Collection page thumbnail and scrolling description.
Merge branch '7.x-collection-page'

# Via root (2) and Jared Whiklo (1)
* 7.x-collection-page:
  Collection page thumbnail and scrolling description.
  Changes to correct menu display issues with Chrome. Line-height was too large and caused the floating objects to stack.
  Fixing thumbnail display on homepage.
  CSS changes to Collections page
  Changes for new Collection page display.
  Modifying the collection display to add Collection information.

Conflicts:
	css/blocks.css
	css/navigation.css
	css/pages.css
	js/script.js
	template.php