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 pull request #265 from jordandukart/7.x

7.x
Merge pull request #263 from ajstanley/7.x

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