Merge remote-tracking branch 'upstream/master'

classes/modules/adminModule.php

@@ -102,7 +102,6 @@ class AdminModule extends abstractModule{
           <a class='brand' href='../admin'>LODSPK Admin Menu</a>
           <div class='nav-collapse'>
             <ul class='nav'>
-              <li ><a href='../admin'>Admin home</a></li>
               <li class='dropdown'>
                <a class='dropdown-toggle' data-toggle='dropdown' href='#'>SPARQL Endpoint<b class='caret'></b></a>
                <ul class='dropdown-menu'>

common.inc.php

@@ -55,8 +55,8 @@ $conf['debug'] = false;
 
 //Session module
 //First version: really simple user/pass
-$conf['session']['user'] = 'admin';
-$conf['session']['password'] = 'admin';
+//$conf['session']['user'] = 'admin';
+//$conf['session']['password'] = 'admin';
 
 
 //Modules: LODSPeaKr will try to match the requested URI