Merge upstream

• merge upstream
• remove galaxy link
• add link to phaeo wbesite and genomic resources
• remove "other organisms are available at"
• fix structural annotation feature count when there is no genes (count mRNA instead)
• update readme

templates/page--front.tpl.php

@@ -148,6 +148,7 @@
                         <?php if (getenv('ENABLE_BLAST')): ?>
                             <?php
                                 $blast_list = explode("&", getenv('ENABLE_BLAST'));
+                                $blast_urls = array();
                                 foreach ($blast_list as $item)
                                     list($str1,$str2) = explode('=', $item, 2);
                                     $name = "Blast";
@@ -174,6 +175,7 @@
                             <?php if (count($blast_urls) > 1): ?>
                                 </ul>
                             </li>
+                            <?php endif; ?>
                         <?php endif; ?>
                         <?php if (getenv('ENABLE_JBROWSE')): ?>
                             <?php