repackaged
Merge branch '7.x' of github.com:Islandora/islandora_image_annotation into 7.x
Merge pull request #29 from ajstanley/7.x

Repackaged