diff --git a/src/lib/php/Plugin/DefaultPlugin.php b/src/lib/php/Plugin/DefaultPlugin.php
index ebdd6044..9aec619d 100644
--- a/src/lib/php/Plugin/DefaultPlugin.php
+++ b/src/lib/php/Plugin/DefaultPlugin.php
@@ -1,423 +1,422 @@
 <?php
 /*
-Copyright (C) 2014-2015, Siemens AG
+Copyright (C) 2014-2016, Siemens AG
 Author: Andreas Würl
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 version 2 as published by the Free Software Foundation.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 namespace Fossology\Lib\Plugin;
 
 use Fossology\Lib\Auth\Auth;
 use Fossology\Lib\UI\Component\Menu;
 use Fossology\Lib\UI\Component\MicroMenu;
 use Monolog\Logger;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Twig_Environment;
 
 abstract class DefaultPlugin implements Plugin
 {
   const PERMISSION = "permission";
   const REQUIRES_LOGIN = "requiresLogin";
   const ENABLE_MENU = "ENABLE_MENU";
   const LEVEL = "level";
   const DEPENDENCIES = "dependencies";
   const INIT_ORDER = "initOrder";
   const MENU_LIST = "menuList";
   const MENU_ORDER = "menuOrder";
   const MENU_TARGET = "menuTarget";
   const TITLE = "title";
     
   /** @var ContainerBuilder */
   protected $container;
   /** @var Twig_Environment */
   protected $renderer;
   /** @var Session */
   private $session;
   /** @var Logger */
   private $logger;
   /** @var Menu */
   private $menu;
   /** @var MicroMenu */
   protected $microMenu;
   /** @var string */
   private $name;
   /** @var string */
   private $version = "1.0";
   /** @var string */
   private $title;
   /** @var int */
   private $permission = Auth::PERM_NONE;
   /** @var int */
   private $requiresLogin = true;
   /** @var int */
   private $PluginLevel = 10;
   /** @var array */
   private $dependencies = array();
   private $InitOrder = 0;
 
   private $MenuList = NULL;
   private $MenuOrder = 0;
   private $MenuTarget = NULL;
 
   public function __construct($name, $parameters = array())
   {
     if ($name === null || $name === "")
     {
       throw new \InvalidArgumentException("plugin requires a name");
     }
     $this->name = $name;
     foreach ($parameters as $key => $value)
     {
       $this->setParameter($key, $value);
     }
 
     global $container;
     $this->container = $container;
     $this->session = $this->getObject('session');
     $this->renderer = $this->getObject('twig.environment');
     $this->logger = $this->getObject('logger');
     $this->menu = $this->getObject('ui.component.menu');
     $this->microMenu = $this->getObject('ui.component.micromenu');
   }
 
   private function setParameter($key, $value)
   {
     switch ($key)
     {
       case self::TITLE:
         $this->title = $value;
         break;
 
       case self::PERMISSION:
         $this->permission = $value;
         break;
 
       case self::REQUIRES_LOGIN:
         $this->requiresLogin = $value;
         break;
 
       case self::LEVEL:
         $this->PluginLevel = $value;
         break;
 
       case self::DEPENDENCIES:
         $this->dependencies = $value;
         break;
 
       case self::INIT_ORDER:
         $this->InitOrder = $value;
         break;
 
       case self::MENU_LIST:
         $this->MenuList = $value;
         break;
 
       case self::MENU_ORDER:
         $this->MenuOrder = $value;
         break;
 
       case self::MENU_TARGET:
         $this->MenuTarget = $value;
         break;
 
       default:
         throw new \Exception("unhandled parameter $key in module " . $this->name);
     }
   }
 
   /**
    * @return string
    */
   public function getName()
   {
     return $this->name;
   }
 
   /**
    * @return string
    */
   public function getVersion()
   {
     return $this->version;
   }
 
   /**
    * @return string
    */
   public function getTitle()
   {
     return $this->title;
   }
 
   /**
    * @return int
    */
   public function isRequiresLogin()
   {
     return $this->requiresLogin;
   }
 
   /**
    * @return array
    */
   public function getDependency()
   {
     return $this->dependencies;
   }
 
   /**
    * @return int
    */
   public function getPluginLevel()
   {
     return $this->PluginLevel;
   }
 
   /**
    * @return int
    */
   public function getDBaccess()
   {
     return $this->permission;
   }
 
   /**
    * @return int
    */
   public function getState()
   {
     return PLUGIN_STATE_READY;
   }
 
   /**
    * @return int
    */
   public function getInitOrder()
   {
     return $this->InitOrder;
   }
 
 
   public function getNoMenu()
   {
     return 0;
   }
 
   /**
    * \brief Customize submenus.
    */
   protected function RegisterMenus()
   {
     if (isset($this->MenuList) && (!$this->requiresLogin || $this->isLoggedIn()))
     {
       menu_insert("Main::" . $this->MenuList, $this->MenuOrder, $this->name, $this->name);
     }
   }
 
   /**
    * @return Response
    */
   public function getResponse()
   {
     $request = Request::createFromGlobals();
     $request->setSession($this->session);
 
     $this->checkPrerequisites();
 
     $startTime = microtime(true);
     $response = $this->handle($request);
     $response->prepare($request);
     $this->logger->debug(sprintf("handle request in %.3fs", microtime(true) - $startTime));
     return $response;
   }
 
   /**
    * @param $name
    * @return object
    */
   public function getObject($name)
   {
     return $this->container->get($name);
   }
 
   public function preInstall()
   {
     $this->RegisterMenus();
   }
 
   public function postInstall()
   {
   }
 
   public function unInstall()
   {
   }
 
   public function execute()
   {
     $startTime = microtime(true);
 
     $response = $this->getResponse();
 
     $this->logger->debug(sprintf("prepare response in %.3fs", microtime(true) - $startTime));
 
     $response->send();
   }
 
   /**
    * @param Request $request
    * @return Response
    */
   protected abstract function handle(Request $request);
 
   /**
    * @param string $templateName
    * @param array $vars
    * @param string[] $headers
    * @return Response
    */
   protected function render($templateName, $vars = null, $headers = null)
   {
     if ($this->requiresLogin && !$this->isLoggedIn())
     {
       new Response("permission denied", Response::HTTP_FORBIDDEN, array("contentType" => "text/plain"));
     }
 
     $startTime = microtime(true);
 
     $content = $this->renderer->loadTemplate($templateName)
         ->render($vars ?: $this->getDefaultVars());
 
     $this->logger->debug(sprintf("%s: render response in %.3fs", get_class($this), microtime(true) - $startTime));
     return new Response(
         $content,
         Response::HTTP_OK,
         $headers ?: $this->getDefaultHeaders()
     );
   }
 
   public function isLoggedIn()
   {
     return (!empty($_SESSION[Auth::USER_NAME]) && $_SESSION[Auth::USER_NAME] != 'Default User');
   }
 
   private function checkPrerequisites()
   {
     if ($this->requiresLogin && !$this->isLoggedIn())
     {
       throw new \Exception("not allowed without login");
     }
 
     foreach ($this->dependencies as $dependency)
     {
       $id = plugin_find_id($dependency);
       if ($id < 0)
       {
         $this->unInstall();
         throw new \Exception("unsatisfied dependency '$dependency' in module '" . $this->getName() . "'");
       }
     }
   }
 
   /**
    * @return array
    */
   protected function getDefaultHeaders()
   {
     return array(
         'Content-type' => 'text/html',
         'Pragma' => 'no-cache',
         'Cache-Control' => 'no-cache, must-revalidate, maxage=1, post-check=0, pre-check=0',
         'Expires' => 'Expires: Thu, 19 Nov 1981 08:52:00 GMT');
   }
 
   /**
    * @return array
    */
   protected function getDefaultVars()
   {
     $vars = array();
 
     $metadata = "<meta name='description' content='The study of Open Source'>\n";
     $metadata .= "<meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>\n";
 
     $vars['metadata'] = $metadata;
 
     if (!empty($this->title))
     {
       $vars[self::TITLE] = htmlentities($this->title);
     }
 
     $styles = "<link rel='stylesheet' href='css/fossology.css'>\n";
     $styles .= "<link rel='stylesheet' href='css/jquery-ui.css'>\n";
     $styles .= "<link rel='stylesheet' href='css/jquery.dataTables.css'>\n";
     $styles .= "<link rel='icon' type='image/x-icon' href='favicon.ico'>\n";
     $styles .= "<link rel='shortcut icon' type='image/x-icon' href='favicon.ico'>\n";
 
     $styles .= $this->menu->OutputCSS();
 
     $vars['styles'] = $styles;
 
     $vars['menu'] = $this->menu->Output($this->title);
 
     global $SysConf;
     if (array_key_exists('BUILD', $SysConf)) {
       $vars['versionInfo'] = array(
           'version' => $SysConf['BUILD']['VERSION'],
           'buildDate' => $SysConf['BUILD']['BUILD_DATE'],
           'commitHash' => $SysConf['BUILD']['COMMIT_HASH'],
-          'commitDate' => $SysConf['BUILD']['COMMIT_DATE']
+          'commitDate' => $SysConf['BUILD']['COMMIT_DATE'],
+          'branchName' => $SysConf['BUILD']['BRANCH']
       );
     }
 
     return $vars;
   }
 
   protected function mergeWithDefault($vars)
   {
     return array_merge($this->getDefaultVars(), $vars);
   }
 
   protected function flushContent($content)
   {
     return $this->render("include/base.html.twig",$this->mergeWithDefault(array("content"=>$content)));
   }
       
   /**
    * @param string $name
    * @throws \Exception
    * @return string|null
    */
   public function __get($name)
   {
     if (method_exists($this, ($method = 'get' . ucwords($name))))
     {
       return $this->$method();
     } else
     {
       throw new \Exception("property '$name' not found in module " . $this->name);
     }
   }
 
   function __toString()
   {
     return getStringRepresentation(get_object_vars($this), get_class($this));
   }
-
-
 }
diff --git a/src/lib/php/Plugin/FO_Plugin.php b/src/lib/php/Plugin/FO_Plugin.php
index 72ea3b42..aec6322a 100644
--- a/src/lib/php/Plugin/FO_Plugin.php
+++ b/src/lib/php/Plugin/FO_Plugin.php
@@ -1,510 +1,510 @@
 <?php
 /***********************************************************
  * Copyright (C) 2008-2013 Hewlett-Packard Development Company, L.P.
  * Copyright (C) 2014-2015 Siemens AG
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * version 2 as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ***********************************************************/
 
 use Fossology\Lib\Auth\Auth;
 use Fossology\Lib\Plugin\Plugin;
 use Fossology\Lib\UI\Component\MicroMenu;
 use Fossology\Lib\UI\Component\Menu;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Each plugin has a state to identify if it is invalid.
  * For example, if a plugin crashes then it should mark the state
  * as invalid.
  */
 define("PLUGIN_STATE_FAIL", -1); // mark it as a total failure
 define("PLUGIN_STATE_INVALID", 0);
 define("PLUGIN_STATE_VALID", 1); // used during install
 define("PLUGIN_STATE_READY", 2); // used during post-install
 
 /**
  * Each plugin has a state to identify the kind of access required.
  * Plugins should select the highest level of access.
  */
 define("PLUGIN_DB_NONE", 0);
 define("PLUGIN_DB_READ", 1);
 define("PLUGIN_DB_WRITE", 3);        /* DB writes permitted */
 define("PLUGIN_DB_ADMIN", 10);        /* add/delete users */
 
 
 
 $NoneText = _("None");
 $ReadText = _("Read");
 $WriteText = _("Write");
 $AdminText = _("Admin");
 $GLOBALS['PERM_NAMES'] = array(Auth::PERM_NONE => $NoneText, Auth::PERM_READ => $ReadText, Auth::PERM_WRITE => $WriteText, Auth::PERM_ADMIN => $AdminText);
 
 /**
  * \class FO_Plugin
  * \brief This is the Plugin class.  All plugins should:
  * 1. Use this class or extend this class.
  * 2. After defining the necessary functions and values, the plugin
  * must add the new element to the Plugins array.
  * For example:
  * $NewPlugin = new Plugin;
  * $NewPlugin->Name="Fred";
  * if ($NewPlugin->Initialize() != 0) { destroy $NewPlugin; }
  */
 class FO_Plugin implements Plugin
 {
   /**
    *  All public fields can be empty, indicating that it does not apply.
    */
 
   var $State = PLUGIN_STATE_INVALID;
 
   /**
    * Name defines the official name of this plugin.  Other plugins may
    * call this plugin based on this name.
    */
   var $Name = "";
   var $Version = "1.0";
   var $Title = "";  // used for HTML title tags and window menu bars
 
   /**
    * Access level restrictions
    */
   var $DBaccess = PLUGIN_DB_NONE; /* what kind of access is needed? */
   var $LoginFlag = 0;        /* Must you be logged in to access this plugin? 1=yes, 0=no */
 
   /**
    * Common for HTML output
    */
   var $NoMenu = 0;        /* 1 = Don't show the HTML menu at the top of page */
   var $NoHeader = 0;        /* 1 = Don't show the HTML header at the top of page */
 
   /**
    * This array lists plugin dependencies by name and initialization order.
    * These are used to call PostInitialize in the correct order.
    * PostInitialize will be called when all dependencies are ready.
    * InitOrder says "after all dependencies are ready, do higher value
    * items first."  For example, this allows for menus to be initialized
    * before anything else.  (You probably won't need to change InitOrder.)
    */
   var $PluginLevel = 10; /* used for sorting plugins -- higher comes first after dependencies are met */
   var $Dependency = array();
   var $InitOrder = 0;
 
   /** @var Menu */
   private $menu;
 
   /** @var MicroMenu */
   protected $microMenu;
 
   /** @var Twig_Environment */
   protected $renderer;
 
   /** @var Request|NULL */
   private $request;
 
   /** @var string[] */
   private $headers = array();
 
   protected $vars = array();
 
   /**
    * Plugins may define a menu item.
    * The menu name defines where it belongs.
    * Each menu item belongs in a category (menu list) and could be in
    * subcategories (menu sublists).  The MenuList identifies
    * the list (and sublists) where this item belongs.  The menu heirarchy
    * is defined by a name and a "::" to denote a submenu item.
    *
    * The MenuName defines the name for this item in the menu.
    *
    * Finally, multiple plugins may place multiple items under the same menu.
    * The MenuOrder assigns a numeric ranking for items.  All items
    * at the same level are sorted alphabetically by MenuName.
    *
    * For example, to define an "About" menu item under the "Help" menu:
    * $MenuList = "Help::About";
    * $MenuOrder=0;
    * And a "delete" agent under the tool, administration menu would be:
    * $MenuList = "Tools::Administration::Delete";
    * $MenuOrder=0;
    *
    * Since menus may link to results that belong in a specific window,
    * $MenuTarget can identify the window.  If not defined, the UI will use
    * a default results window.
    *
    * /note
    * 1. If the MenuList location does not exist, then it will be created.
    * 2. If a plugin does not have a menulist item, then it will not appear
    * in any menus.
    * 3. MenuList is case and SPACE sensitive.  "Help :: About" defines
    * "Help " and " About".  While "Help::About" defines "Help" and "About".
    */
   var $MenuList = NULL;
   var $MenuOrder = 0;
   var $MenuTarget = NULL;
 
   /**
    * These next variables define required functionality.
    * If the functions exist, then they are called.  However, plugins are
    * not required to define any of these.
    */
 
   /**
    * \brief This function (when defined) is only called when
    * the plugin is first installed.  It should make sure all
    * requirements are available and create anything it needs to run.
    * It returns 0 on success, non-zero on failure.
    * A failed install is not inserted in the system.
    *
    * \note It may be called multiple times.  It must check that
    * changes are needed BEFORE doing any changes.
    * Also, it must check for partial installs in case the user is
    * recovering from an installation failure.
    */
   function Install()
   {
     return 0;
   }
 
   /**
    * \brief This function (when defined) is only called once,
    * when the plugin is removed.  It should uninstall and remove
    * all items that are only used by this plugin.  There should be
    * no residues -- if the plugin is ever installed again, it should
    * act like a clean install.  Thus, any DB, files, or state variables
    * specific to this plugin must be removed.
    * This function must always succeed.
    */
   function Remove()
   {
     return;
   }
 
   /**
    * \brief base constructor.  Most plugins will just use this
    *
    * Makes sure the plugin is in the correct state.  If so, the plugin is
    * inserted into the Plugins data structure.
    *
    * The constructor assumes that Install() was already run one time (possibly
    * years ago and not during this object's creation).
    *
    * \return true on success, false on failure.
    *
    * On failure the plugin is not used by the system. NOTE: This function must
    * NOT assume that other plugins are installed.  See PostInitialize.
    */
   public function __construct()
   {
     $this->OutputType = $this->OutputType ?: "HTML";
     $this->State = PLUGIN_STATE_VALID;
     register_plugin($this);
 
     global $container;
     $this->menu = $container->get('ui.component.menu');
     $this->microMenu = $container->get('ui.component.micromenu');
     $this->renderer = $container->get('twig.environment');
   }
 
   /**
    * \brief dummy stub till all references are removed.
    */
   function Initialize()
   {
     return (TRUE);
   } // Initialize()
 
   /**
    * \brief This function is called before the plugin
    * is used and after all plugins have been initialized.
    * If there is any initialization step that is dependent on other
    * plugins, put it here.
    *
    * \return true on success, false on failure.
    *
    * \note Do not assume that the plugin exists!  Actually check it!
    */
   function PostInitialize()
   {
     if ($this->State != PLUGIN_STATE_VALID)
     {
       return 0;
     } // don't run
 
     if (empty($_SESSION['User']) && $this->LoginFlag)
     {
       return 0;
     }
     // Make sure dependencies are met
     foreach ($this->Dependency as $key => $val)
     {
       $id = plugin_find_id($val);
       if ($id < 0)
       {
         $this->Destroy();
         return (0);
       }
     }
 
     // Put your code here!
     // If this fails, set $this->State to PLUGIN_STATE_INVALID.
     // If it succeeds, then set $this->State to PLUGIN_STATE_READY.
 
     // It worked, so mark this plugin as ready.
     $this->State = PLUGIN_STATE_READY;
     // Add this plugin to the menu
     if ($this->MenuList !== "")
     {
       menu_insert("Main::" . $this->MenuList, $this->MenuOrder, $this->Name, $this->MenuTarget);
     }
     return ($this->State == PLUGIN_STATE_READY);
   } // PostInitialize()
 
   /**
    * \brief While menus can be added to any time at or after
    * the PostInitialize phase, this is the standard location for
    * registering this item with menus.
    *
    * \note 1: Menu registration may be plugin specific!
    * \note 2: This is intended for cross-plugin registration and not
    * for the main menu.
    */
   function RegisterMenus()
   {
     if ($this->State != PLUGIN_STATE_READY)
     {
       return (0);
     } // don't run
     // Add your own menu items here.
     // E.g., menu_insert("Menu_Name::Item");
   }
 
   /**
    * \brief This is a destructor called after the plugin
    * is no longer needed.  It should assume that PostInitialize() was
    * already run one time (this session) and succeeded.
    * This function must always succeed.
    */
   function Destroy()
   {
     $this->State = PLUGIN_STATE_INVALID;
   }
 
   /**
    * The output functions generate "output" for use in a text CLI or web page.
    * For agents, the outputs generate status information.
    */
 
   /* Possible values: Text, HTML, XML, JSON */
   var $OutputType = "HTML";
   var $OutputToStdout = 0;
 
   /**
    * \brief This function is called when user output is
    * requested.  This function is responsible for assigning headers.
    *
    * @internal param $vars
    */
   function OutputOpen()
   {
     if ($this->State != PLUGIN_STATE_READY)
     {
       return (0);
     }
 
     $this->headers['Content-type'] = 'text/html';
     $this->headers['Pragma'] = 'no-cache';
     $this->headers['Cache-Control'] = 'no-cache, must-revalidate, maxage=1, post-check=0, pre-check=0';
     $this->headers['Expires'] = 'Expires: Thu, 19 Nov 1981 08:52:00 GMT';
 
     $metadata = "<meta name='description' content='The study of Open Source'>\n";
     $metadata .= "<meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>\n";
 
     $this->vars['metadata'] = $metadata;
 
     if (!empty($this->Title))
     {
       $this->vars['title'] = htmlentities($this->Title);
     }
 
     $styles = "<link rel='stylesheet' href='css/fossology.css'>\n";
     $styles .= "<link rel='stylesheet' href='css/jquery-ui.css'>\n";
     $styles .= "<link rel='stylesheet' href='css/jquery.dataTables.css'>\n";
     $styles .= "<link rel='icon' type='image/x-icon' href='favicon.ico'>\n";
     $styles .= "<link rel='shortcut icon' type='image/x-icon' href='favicon.ico'>\n";
 
     if ($this->NoMenu == 0)
     {
       $styles .= $this->menu->OutputCSS();
     }
     $this->vars['styles'] = $styles;
 
     if ($this->NoMenu == 0)
     {
       $this->vars['menu'] = $this->menu->Output($this->Title);
     }
 
     global $SysConf;
     $this->vars['versionInfo'] = array(
         'version' => $SysConf['BUILD']['VERSION'],
         'buildDate' => $SysConf['BUILD']['BUILD_DATE'],
         'commitHash' => $SysConf['BUILD']['COMMIT_HASH'],
-        'commitDate' => $SysConf['BUILD']['COMMIT_DATE']
+        'commitDate' => $SysConf['BUILD']['COMMIT_DATE'],
+        'branchName' => $SysConf['BUILD']['BRANCH']
     );
 
   } // OutputOpen()
 
   /**
    * @brief Similar to OutputClose, this ends the output type
    * for this object.  However, this does NOT change any global
    * settings.  This is called when this object is a dependency
    * for another object.
    */
   function OutputUnSet()
   {
     if ($this->State != PLUGIN_STATE_READY)
     {
       return 0;
     }
     return "";
   }
 
   /**
    * @return Response
    */
   function getResponse()
   {
     ob_start();
     $output = $this->Output();
 
     if($output instanceof Response)
     {
       $response = $output;
     }
     else
     {
       if (empty($this->vars['content']) && $output)
       {
         $this->vars['content'] = $output;
       } elseif (empty($this->vars['content']))
       {
         $this->vars['content'] = ob_get_contents();
       }
       $response = $this->render($this->getTemplateName());
     }
     ob_end_clean();
     
     return $response;
   }
 
 
   /**
    * @brief This function is called when user output is
    * requested.  This function is responsible for content.
    * (OutputOpen and Output are separated so one plugin
    * can call another plugin's Output.)
    */
   function Output() {
     return new Response("ERROR: Output() method of FO_Plugin not defined in class '" . get_class($this) . "'", Response::HTTP_INTERNAL_SERVER_ERROR);
   }
 
   public function getTemplateName()
   {
     return "include/base.html.twig";
   }
 
   /**
    * @param string $templateName
    * @param array $vars
    * @return string
    */
   public function renderString($templateName, $vars = null)
   {
     return $this->renderer->loadTemplate($templateName)->render($vars ?: $this->vars);
   }  
   
   /**
    * @param string $templateName
    * @param array $vars
    * @return Response
    */
   protected function render($templateName, $vars = null)
   {
     $content = $this->renderString($templateName, $vars);
 
     return new Response(
         $content,
         Response::HTTP_OK,
         $this->headers
     );
   }
 
   /**
    * @return Request
    */
   public function getRequest()
   {
     if (!isset($this->request))
     {
       $this->request = Request::createFromGlobals();
     }
     return $this->request;
   }
 
   public function execute()
   {
     $this->OutputOpen();
     $response = $this->getResponse();
     $response->prepare($this->getRequest());
     $response->send();
   }
 
   function preInstall()
   {
     if ($this->State == PLUGIN_STATE_VALID)
     {
       $this->PostInitialize();
     }
     if ($this->State == PLUGIN_STATE_READY)
     {
       $this->RegisterMenus();
     }
   }
 
   function postInstall()
   {
     $state = $this->Install();
     if ($state != 0)
     {
       throw new Exception("install of plugin " . $this->Name . " failed");
     }
   }
 
   function unInstall()
   {
     $this->Destroy();
   }
 
   public function getName()
   {
     return $this->Name;
   }
 
   function __toString()
   {
     return getStringRepresentation(get_object_vars($this), get_class($this));
   }
-
 }
diff --git a/src/lib/php/UI/Component/Menu.php b/src/lib/php/UI/Component/Menu.php
index fc24ebd3..d72f9eca 100644
--- a/src/lib/php/UI/Component/Menu.php
+++ b/src/lib/php/UI/Component/Menu.php
@@ -1,330 +1,330 @@
 <?php
 /***********************************************************
  * Copyright (C) 2008-2011 Hewlett-Packard Development Company, L.P.
  * Copyright (C) 2014-2015 Siemens AG
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * version 2 as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ***********************************************************/
 
 namespace Fossology\Lib\UI\Component;
 
 use Fossology\Lib\Auth\Auth;
 use Fossology\Lib\Util\Object;
 use Twig_Environment;
 
 class Menu extends Object
 {
   const FULL_MENU_DEBUG = 'fullmenudebug';
   var $MenuTarget = "treenav";
   protected $renderer;
 
   public function __construct(Twig_Environment $renderer)
   {
     // Add default menus (with no actions linked to plugins)
     menu_insert("Main::Upload", 70);
     menu_insert("Main::Jobs", 60);
     menu_insert("Main::Organize", 50);
     menu_insert("Main::Help", -1);
     menu_insert("Main::Help::Documentation", 0, NULL, NULL, NULL, "<a href='http://www.fossology.org/projects/fossology/wiki/User_Documentation'>Documentation</a>");
     $this->renderer = $renderer;
   }
 
   /**
    * \brief Recursively generate the menu in HTML.
    */
   function menu_html(&$menu, $indent)
   {
     if (empty($menu))
     {
       return;
     }
     $output = "";
     $output .= "<!--[if lt IE 7]><table><tr><td><![endif]-->\n";
     $output .= "<ul id='menu-$indent'>\n";
     
     foreach ($menu as $menuEntry)
     {
       $output .= '<li>';
 
       if (!empty($menuEntry->HTML))
       {
         $output .= $menuEntry->HTML;
       } else /* create HTML */
       {
         $output .= $this->createHtmlFromMenuEntry($menuEntry, $indent);
       }
 
       if (!empty($menuEntry->SubMenu))
       {
         $output .= $this->menu_html($menuEntry->SubMenu, $indent + 1);
       }
     }
     $output .= "</ul>\n";
     $output .= "<!--[if lt IE 7]></td></tr></table></a><![endif]-->\n";
     return preg_replace("|<li><a href=\"#\"><font color(.*)*?$|m", '', $output);
   }
   
   function createHtmlFromMenuEntry(\menu $menuEntry, $indent)
   {
     $isFullMenuDebug = array_key_exists(self::FULL_MENU_DEBUG, $_SESSION) && $_SESSION[self::FULL_MENU_DEBUG] == 1;
     $output = "";
     if (!empty($menuEntry->URI))
     {
       $output .= '<a  id="'. htmlentities($menuEntry->FullName) .'" href="' . Traceback_uri() . "?mod=" . $menuEntry->URI;
       if (empty($menuEntry->Target) || ($menuEntry->Target == ""))
       {
         $output .= '">';
       } else
       {
         $output .= '" target="' . $menuEntry->Target . '">';
       }
       if ($isFullMenuDebug)
       {
         $output .= $menuEntry->FullName . "(" . $menuEntry->Order . ")";
       } else
       {
         $output .= $menuEntry->Name;
       }
     } else
     {
       $output .= '<a id="'. htmlentities($menuEntry->FullName) .'" href="#">';
       if (empty($menuEntry->SubMenu))
       {
         $output .= "<font color='#C0C0C0'>";
         if ($isFullMenuDebug)
         {
           $output .= $menuEntry->FullName . "(" . $menuEntry->Order . ")";
         }
         else
         {
           $output .= '';
         }
         $output .= "</font>";
       } else
       {
         if ($isFullMenuDebug)
         {
           $output .= $menuEntry->FullName . "(" . $menuEntry->Order . ")";
         } else
         {
           $output .= $menuEntry->Name;
         }
       }
     }
 
     if (!empty($menuEntry->SubMenu) && ($indent > 0))
     {
       $output .= " <span>&raquo;</span>";
     }
     $output .= "</a>\n";
     return $output;
   }
 
   /**
    * \brief Create the output CSS.
    */
   function OutputCSS()
   {
     $output = "";
 
     $output .= "<style type=\"text/css\">\n";
     /* Depth 0 is special: position is relative, colors are blue */
     $depth = 0;
     $label = "";
     $Menu = menu_find("Main", $MenuDepth);
     $cssBorder = "border-color:#CCC #CCC #CCC #CCC; border-width:1px 1px 1px 1px;";
     $cssPadding = "padding:4px 0px 4px 4px;";
     $FOSScolor1 = "#c50830";
     $FOSScolor2 = "#808080";
     $FOSSbg = "white";
 
     $FOSSfg1 = "black";
     $FOSSbg1 = "white";
     $FOSSfg1h = $FOSScolor1; // highlight colors
     $FOSSbg1h = "beige";
 
     $FOSSfg2 = "black";
     $FOSSbg2 = "beige";
     $FOSSfg2h = $FOSScolor1; // highlight colors
     $FOSSbg2h = "beige";
 
     $FOSSfg3 = "black";
     $FOSSbg3 = "beige";
     $FOSSfg3h = $FOSScolor1; // highlight colors
     $FOSSbg3h = "beige";
 
     if ($depth < $MenuDepth)
     {
       /** The "float:left" is needed to fix IE **/
       $output .= "\n/* CSS for Depth $depth */\n";
       $label = "ul#menu-" . $depth;
       $output .= $label . "\n";
       $output .= "  { z-index:0; margin:0; padding:0px; list-style:none; background:$FOSSbg1; width:100%; height:24px; font:normal 14px verdana, arial, helvetica; font-weight: bold; }\n";
       $label .= " li";
       $output .= $label . "\n";
       $output .= "  { float:left; margin:0; padding:0px; display:block; position:relative; width:auto; border:0px solid #000; }\n";
       $output .= $label . " a:link,\n";
       $output .= $label . " a:visited\n";
       $output .= "  { float:left; padding:4px 10px; text-decoration:none; color:$FOSSfg1; background:$FOSSbg1; width:auto; display:block; }\n";
       $output .= $label . ":hover a,\n";
       $output .= $label . " a:hover,\n";
       $output .= $label . " a:active\n";
       $output .= "  { float:left; padding:4px 10px; color:$FOSSfg1h; background:$FOSSbg1h; $cssBorder width:auto; display:block; }\n";
       $output .= $label . " a span\n";
       $output .= "  { float:left; position:absolute; top:0; left:135px; font-size:12pt; }\n";
       $depth++;
     }
 
     /* Depth 1 is special: position is absolute. Left is 0, top is 24 */
     if ($depth < $MenuDepth)
     {
       $output .= "\n/* CSS for Depth $depth */\n";
       $output .= $label . " ul#menu-" . $depth . "\n";
       $output .= "  { margin:0; padding:0px 0; list-style:none; display:none; visibility:hidden; left:0px; width:150px; position:absolute; top:24px; font-weight: bold; }\n";
       $output .= $label . ":hover ul#menu-" . $depth . "\n";
       $output .= "  { float:left; display:block; visibility:visible; }\n";
       $label .= " ul#menu-" . $depth . " li";
       $output .= $label . "\n";
       $output .= "  { z-index:$depth; margin:0; padding:0; display:block; visibility:visible; position:relative; width:150px; }\n";
       $output .= $label . " a:link,\n";
       $output .= $label . " a:visited\n";
       $output .= "  { z-index:$depth; $cssPadding color:$FOSSfg2; background:$FOSSbg2; border:1px solid #000; $cssBorder width:150px; display:block; visibility:visible; }\n";
       $output .= $label . ":hover a,\n";
       $output .= $label . " a:active,\n";
       $output .= $label . " a:hover\n";
       $output .= "  { z-index:$depth; $cssPadding color:$FOSSfg2h; background:$FOSSbg2h; width:150px; display:block; visibility:visible; }\n";
       $output .= $label . " a span\n";
       $output .= "  { text-align:left; }\n";
       $depth++;
     }
 
     /* Depth 2+ is recursive: position is absolute. Left is 150*(Depth-1), top is 0 */
     for (; $depth < $MenuDepth; $depth++)
     {
       $output .= "\n/* CSS for Depth $depth */\n";
       $output .= $label . " ul#menu-" . $depth . "\n";
       $output .= "  { margin:0; padding:1px 0; list-style:none; display:none; visibility:hidden; left:156px; width:150px; position:absolute; top:-1px; font-weight: bold; }\n";
       $output .= $label . ":hover ul#menu-" . $depth . "\n";
       $output .= "  { float:left; display:block; visibility:visible; }\n";
       $label .= " ul#menu-" . $depth . " li";
       $output .= $label . "\n";
       $output .= "  { z-index:$depth; margin:0; padding:0; display:block; visibility:visible; position:relative; width:150px; }\n";
       $output .= $label . " a:link,\n";
       $output .= $label . " a:visited\n";
       $output .= "  { z-index:$depth; $cssPadding color:$FOSSfg3; background:$FOSSbg2h; border:1px solid #000; $cssBorder width:150px; display:block; }\n";
       $output .= $label . ":hover a,\n";
       $output .= $label . " a:active,\n";
       $output .= $label . " a:hover\n";
       $output .= "  { z-index:$depth; $cssPadding color:$FOSSfg3h; background:$FOSSbg3h; width:150px; display:block; visibility:visible; }\n";
       $output .= $label . " a span\n";
       $output .= "  { text-align:left; }\n";
     }
     $output .= "</style>\n";
 
     /* For IE's screwed up CSS: this defines "hover". */
     $output .= "<!--[if lt IE 8]>\n";
     $output .= "<style type='text/css' media='screen'>\n";
     /** csshover.htc provides ":hover" support for IE **/
     $output .= "body { behavior:url(csshover.htc); }\n";
     /** table definition needed to get rid of extra space under items **/
     for ($i = 1; $i < $MenuDepth; $i++)
     {
       $output .= "#menu-$i table {height:0px; border-collapse:collapse; margin:0; padding:0; }\n";
       $output .= "#menu-$i td {height:0px; border:none; margin:0; padding:0; }\n";
     }
     $output .= "</style>\n";
     $output .= "<![endif]-->\n";
 
     $this->_CSSdone = 1;
     return ($output);
   } // OutputCSS()
 
   /**
    * @brief Create the output.
    */
   function Output($title = NULL)
   {
     global $SysConf;
     $sysConfig = $SysConf['SYSCONFIG'];
 
     $vars = array();
     $vars['title'] = empty($title) ? _("Welcome to FOSSology") : $title;
     $vars['bannerMsg'] = @$sysConfig['BannerMsg'];
     $vars['logoLink'] =  $sysConfig['LogoLink']?: 'http://fossology.org';
     $vars['logoImg'] =  $sysConfig['LogoImage']?: 'images/fossology-logo.gif';
 
     if ( array_key_exists('SupportEmailLabel',$sysConfig) && !empty($sysConfig['SupportEmailLabel'])
             && array_key_exists('SupportEmailAddr',$sysConfig) && !empty($sysConfig['SupportEmailAddr'])){
       $menuItem = '<a href="mailto:'.$sysConfig['SupportEmailAddr'].'?subject='.@$sysConfig['SupportEmailSubject'].'">'.$sysConfig['SupportEmailLabel'].'</a>';
       menu_insert("Main::Help::".$sysConfig['SupportEmailLabel'], 0, NULL, NULL, NULL, $menuItem);
     }    
 
     $menu = menu_find("Main", $MenuDepth);
     $vars['mainMenu'] = $this->menu_html($menu, 0);
     $vars['uri'] = Traceback_uri();
     
     /* Handle login information */
     $vars['isLoggedOut'] = ((empty($_SESSION[Auth::USER_NAME])) or ($_SESSION[Auth::USER_NAME] == "Default User"));
     $vars['isLoginPage'] = GetParm("mod", PARM_STRING)=='auth';
 
     global $SysConf;
     if (array_key_exists('BUILD', $SysConf)) {
       $vars['versionInfo'] = array(
           'version' => $SysConf['BUILD']['VERSION'],
           'buildDate' => $SysConf['BUILD']['BUILD_DATE'],
           'commitHash' => $SysConf['BUILD']['COMMIT_HASH'],
-          'commitDate' => $SysConf['BUILD']['COMMIT_DATE']
+          'commitDate' => $SysConf['BUILD']['COMMIT_DATE'],
+          'branchName' => $SysConf['BUILD']['BRANCH']
       );
     }
 
     if(!$vars['isLoggedOut'])
     {
       $this->mergeUserLoginVars($vars);
     }
     
     $out = $this->renderer->loadTemplate('components/menu.html.twig')->render($vars);
     return $out;
   }
 
   private function mergeUserLoginVars(&$vars)
   {
     global $container;
     $dbManager = $container->get("db.manager");
 
     $vars['logOutUrl'] = Traceback_uri() . '?mod=' . ((plugin_find_id('auth')>=0) ? 'auth' : 'smauth');
     $vars['userName'] = $_SESSION[Auth::USER_NAME];
     
     $sql = 'SELECT group_pk, group_name FROM group_user_member LEFT JOIN groups ON group_fk=group_pk WHERE user_fk=$1';
     $stmt = __METHOD__ . '.availableGroups';
     $dbManager->prepare($stmt, $sql);
     $res = $dbManager->execute($stmt, array($_SESSION['UserId']));
     $allAssignedGroups = array();
     while ($row = $dbManager->fetchArray($res))
     {
       $allAssignedGroups[$row['group_pk']] = $row['group_name'];
     }
     $dbManager->freeResult($res);
     if (count($allAssignedGroups) > 1)
     {
       $vars['backtraceUri'] = Traceback_uri() . "?mod=" . Traceback_parm();
       $vars['groupId'] = $_SESSION[Auth::GROUP_ID];
       $vars['allAssignedGroups'] = $allAssignedGroups;
     }
     else
     {
       $vars['singleGroup'] = @$_SESSION['GroupName'];
     }
   }
 }
-
diff --git a/src/www/ui/template/components/menu.html.twig b/src/www/ui/template/components/menu.html.twig
index 23ed730a..af9e0e26 100644
--- a/src/www/ui/template/components/menu.html.twig
+++ b/src/www/ui/template/components/menu.html.twig
@@ -1,52 +1,53 @@
 {# Copyright 2014-2015 Siemens AG
 
    Copying and distribution of this file, with or without modification,
    are permitted in any medium without royalty provided the copyright notice and this notice are preserved.
    This file is offered as-is, without any warranty.
 #}
 {% if bannerMsg %}
 <div style="background-color:#ffbbbb">{{ bannerMsg }}</div>
 {% endif %}
 <table border="0" width="100%">
   <tr>
     <td width="150" rowspan="2"><a href="{{ logoLink }}" target="_top" style="background:white;">
         <img alt="FOSSology" title="FOSSology" src="{{ logoImg }}" border="0"></a>
     </td>
     <td colspan="2">
       {{ mainMenu }}
     </td>
   </tr>
   <tr>
     <td style="font-size:x-large; font-weight: bold;">{{ title  }}
       {% if versionInfo %}<br/>
         {# versionInfo contains all the variables defined at build time in the [BUILD] section of /VERSION #}
-        <span id="versionInfo" style="font-size: xx-small; color: gray;">{{ versionInfo.version }}, commit: [#{{ versionInfo.commitHash }}] {{ versionInfo.commitDate }} built @ {{ versionInfo.buildDate }}</span>
+        {% set extractVersion = versionInfo.version|split('-') %}
+        <span id="versionInfo" style="font-size: xx-small; color: gray;">Version: [{{ extractVersion[0] }}], Branch: [{{ versionInfo.branchName }}], Commit: [#{{ versionInfo.commitHash }}] {{ versionInfo.commitDate }} built @ {{ versionInfo.buildDate }}</span>
       {% endif %}</td>
     <td align="right" valign="bottom">
       {% if isLoggedOut %}
         <small>{% if isLoginPage %}{{ 'Login'|trans }}{% else %}<a href="{{ uri }}?mod=auth"><b>{{ 'Login'|trans }}</b></a>{% endif %}</small>
       {% else %}
         <small><a href="{{ logOutUrl }}"><b>logout</b></a></small>
         <table style="text-align: left;">
           <tr>
             <td align="right"><small>{{ 'User'|trans }}:</small></td>
             <td>{{ userName }}</td>
           </tr>
           <tr>
             <td align='right'><small>{{ 'Group'|trans }}:</small></td>
             <td>
               {% if singleGroup %}{{ singleGroup }}
               {%else%}       
                 <form action="{{ backtraceUri }}" method="post">
                   {% import "include/macros.html.twig" as macro %}
                   {{ macro.select('selectMemberGroup',allAssignedGroups,'selectMemberGroup',groupId,' onchange="this.form.submit()"') }}
               </form>
               {% endif %}
             </td>
           </tr>
         </table>
       {% endif %}
     </td>
   </tr>
 </table>
 <hr />