wrapped command to avoid errors for uninstalled objects
resolved conflict
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
added islandora xml default for datastrram replacement
updated mimetype selection
updated mimetype selection
coder
allwed for existing non-standard mimetype
removed unused variable, added default
Merge pull request #547 from ajstanley/EMiC-210

Emic 210