Merge branch 'fits' of github.com:ruebot/islandora into fits

Conflicts:
	plugins/fits.inc

plugins/fits.inc

@@ -50,11 +50,11 @@ class fits {
    */
   function displayFits() {
     $output = '';
-    $exif = $this->item->get_datastream_dissemination('FITS');
+    $fits = $this->item->get_datastream_dissemination('FITS');
-    if (trim($exif) != '') {
+    if (trim($fits) != '') {
-      $exifDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS'));
+      $fitsDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS'));
-      if ($exifDom != NULL) {
+      if ($fitsDom != NULL) {
-        $description = $exifDom->getElementsByTagName('fits');
+        $description = $fitsDom->getElementsByTagName('fits');
         if ($description->length > 0) {
           $description = $description->item(0);
           $output .= '<div class="fedora_technical_metadata"><ul>';