Merge pull request #124 from amcgowanca/7.x-1.x

Contributed module additions, deletions and updates
Update drupal-org.make
Updated version of User Permissions component to latest dev release.