Merge pull request #36 from ajstanley/7.x

Shorter Labels
Merge branch '7.x' of github.com:discoverygarden/islandora_critical_edition_advanced into 7.x