Put stuff back, and take a ISLANDORACM away.
Merge branch '7.x' of github.com:islandora/islandora_solution_pack_book into 7.x-ISLANDORA-962

Conflicts:
	data/datastreams/islandora_book_collection_policy.xml
Let's try and do ISLANDORA-962 again.
Merge pull request #148 from ruebot/7.x-1.4-ISLANDORA-962

7.x 1.4 islandora 962