Merge branch '7.x-solution-pack-viewer-whitescreen' of https://github.com/nigelgbanks/islandora into 7.x
allow mulitple mime types for viewers
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
Merge branch '7.x-hookable-metadata' of github.com:jordandukart/islandora into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
remove comment
docs update for array of mime types
spelling
cs fixes
README normalization
Merge pull request #470 from ruebot/7.x-1.3

README normalization
Try getting rid of the "upgrade-all" shenanigans.
Merge pull request #475 from adam-vessey/7.x-1.3-fix-travis

Try getting rid of the "upgrade-all" shenanigans.
Don't render unneeded markup when there is no thumbnail.
Merge pull request #479 from jordandukart/7.x-1.3

Don't render unneeded markup when there is no thumbnail.
Grab latest PHPCS as Coder now supports it.
Merge pull request #481 from jordandukart/7.x-1.3

Grab latest PHPCS as Coder now supports it.
handling NULL source_dsids in datastream_access hook