Address ISLANDORA-1045
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_collection into 7.x-ISLANDORA-1045

Conflicts:
	islandora_basic_collection.module
	xml/islandora_basic_collection_content_model.xml
Fix accidental swap from fixing merge conflicts.
Merge pull request #115 from ruebot/7.x-ISLANDORA-1045

Address ISLANDORA-1045