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
Merge pull request #32 from philsogaDGI/7.x

modify manage permissions D7
Merge pull request #31 from jordandukart/7.x

7.x
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_collection into 7.x-release

Conflicts:
	islandora_basic_collection.info
Merge branch '7.x-release' of github.com:Islandora/islandora_solution_pack_collection into 7.x-release
Updated version number for 7.x-1.1-RC2
Merge remote branch 'upstream/7.x-release' into flvc-release