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.
altered solr output
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_book into 7.x
coder
Merge branch '7.x-ISLANDORA-962' of github.com:ruebot/islandora_solution_pack_book into EMiC-261
Merge pull request #147 from ruebot/7.x-ISLANDORA-962

DESTROY ISLANDORACM!!!
Update README.md
Merge pull request #150 from sallain/patch-1

Update README.md
removed debug line
degoofed function
Merge pull request #149 from ajstanley/EMiC-261

Stops trying to search for *:* in book text if that was your solr search.  All other searches still pass through.
add page fragment regardless of search type
Update LICENSE.txt

Changed from AGPL to GPL
Merge pull request #155 from sallain/patch-4

Update LICENSE.txt
Merge pull request #152 from nhart/7.x-page-fragment-missing-advanced-search

add page fragment regardless of search type