Merge branch '7.x' of github.com:discoverygarden/islandora_xacml_editor into 7.x