Merge branch '7.x' of github.com:Islandora/islandora into 7.x
ingestConstructedObject function
removed the test for the test?
Merge pull request #1 from Islandora/7.x

update 7.x
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
some issues in the docs
travis got angry
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
add nonsort and trailing space
fix the code format
added specific image assertions
datastream validation
undelete docs
preventing RELS-EXT deletion
Merge pull request #407 from willtp87/7.x.rels-ext_undeletable

7.x.rels ext undeletable
Changes required for metadata display refinements.
Update to include two separate metadata callbacks as opposed to one.
Update api.php to reflect changes to the hook.
Fix path broken by 1438e806cd92a2b74f718dab83609797edc0fb53.
Merge pull request #408 from jordandukart/7.x-fix-print

Fix path broken by 1438e806cd92a2b74f718dab83609797edc0fb53.