Address ISLANDORA-1023
Merge pull request #119 from ruebot/7.x-ISLANDORA-1023

Address ISLANDORA-1023
Merge branch '7.x' of github.com:islandora/islandora_scholar into 7.x-ISLANDORA-977