Merge pull request #1 from daniel-dgi/7.x

Making the menu paths respect Alan's new perms.
Merge pull request #6 from ajstanley/7.x

Danny's changes along with form alters and permission hooks.
added object locking
Merge branch '7.x' of github.com:ajstanley/islandora_xquery into 7.x
adjusted space
Merge pull request #7 from ajstanley/7.x

Added object locking
Preprocessing to get rid of xml entity encoding mania.  Redirect is done more properly with drupal functions to avoid escaping issues.