code cleanup, reverted menu paths
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_collection into 7.x
Merge pull request #27 from nigelgbanks/7.x-ingest-index-problem

1013 MARCXml module ingest hook conflicts with Newspaper/Book page inges...
fixed cocncerns from ticket 1001
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_collection into 7.x
cleaned up menus
Change the default collection query to use Adam's SPARQL query so we can filter on namespace restrictions which we could not do previously. Any other modules that implement islandora_basic_collection_query_alter will need to be updated such that they change their query type to the correct language (XACML/OAI for sure).
Changes as per Adam's feedback.
Minus dsm.
Merge pull request #30 from jordandukart/7.x

Change the default collection query to use Adam's SPARQL query so we can...
Menu corrections
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_collection into 7.x
added wrapper logic to allow for use of admin_menu module
comments and optimization
unncommented drupal_alter.  This version of collection manager must havecurrent version of xacml api
Merge pull request #29 from ajstanley/7.x

7.x
modify manage permissions D7
Code Review

* Removed windows line endings (^M).
* Removed module include of test file in module file.
* Applied coding standards.
Merge pull request #1 from nigelgbanks/7.x-code-review

Code Review
edit conflicts in info file