Updated the dc composite xml file
Buildfile and doxyfile
Sed fix
Merge pull request #56 from daniel-dgi/7.x

Buildfile and doxyfile
Merge pull request #54 from philsogaDGI/7.x

Updated the dc composite xml file
Update islandora_large_image.info

Changed to have the proper solution pack name.
Add clipping to large image when seadragon is the viewer (ONTIME-1262).
Removal of dds.
7.x grammar fixes
Merge pull request #58 from daitken/7.x

7.x grammar fixes
Code styling and fixes per codereview.
Merge conflicts.
Merge pull request #57 from jordandukart/7.x

Add clipping to large image when seadragon is the viewer (ONTIME-1262).
change OBJ mime to tif, thus making batch_importer happy. avessey++ pmurray++
yank ORDERED attribute
Merge pull request #59 from ruebot/7.x

change OBJ mime to tif, thus making batch_importer happy. avessey++ pmur...
Merge branch '7.x' of git://github.com/Islandora/islandora_solution_pack_large_image into 7.x

Conflicts:
	includes/derivatives.inc