modify manage permissions D7
Code Review

 * Removed Windows line endings (^M).
 * Applied Coding Standards.
Merge pull request #1 from nigelgbanks/7.x-code-review

Code Review
Merge pull request #267 from philsogaDGI/7.x

modify manage permissions D7
Merge remote-tracking branch 'upstream/7.x' into lyr-master