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
return to collection link fix
a coder fix
Merge pull request #37 from willtp87/7.x

return to collection link fix
Merge remote branch 'upstream/7.x' into flvc