first commit
Merge branch '7.x' of https://github.com/discoverygarden/islandora_object_lock into 7.x