Merge remote-tracking branch 'upstream/master'

app/routes.php

@@ -168,6 +168,7 @@ HTML::macro('breadcrumbs', function() {
       unset($crumbs[$key]);
     }
   }
+  $crumbs = array_values($crumbs);
   for ($i=0; $i<count($crumbs); $i++) {
     $crumb = trim($crumbs[$i]);
     if (!$crumb) continue;

app/views/invoices/edit.blade.php

@@ -567,7 +567,12 @@
     invoice.imageLogoWidth1 =120;
     invoice.imageLogoHeight1 = 40
 
-		return invoice;
+    invoice.imageLogo2 = "{{ HTML::image_data('images/report_logo2.jpg') }}";
+    invoice.imageLogoWidth2 =325/2;
+    invoice.imageLogoHeight2 = 81/2;
+
+
+    return invoice;
 	}
 
 	/*