merge corrections

js/headfoot.js

-var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},/* {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'*/},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'}, /* {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'*/}/*,{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'}*/,{'name':'Login', 'combos':[], 'type':'loginbutton', 'link':'/account/'}];
+var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconference.html'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'}/*,{'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'}/*,{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},*/{'name':'Login', 'combos':[], 'type':'loginbutton', 'link':'/account/'}];
+
 
 var hft_links = [{'url':'http://www.hft-stuttgart.de/Forschung/M4-Lab/Team/index.html/de', 'name':'Kontakt'},{'url':'http://www.hft-stuttgart.de/Hochschule/Impressum.html/de', 'name':'Impressum'},{'url':'http://www.hft-stuttgart.de/Einrichtungen/Datenschutz/Datenschutz-Homepage', 'name':'Datenschutz'}]
 
@@ -153,13 +154,13 @@ function head(){
     magnifier.id="sf_submit";
     magnifier.value="search";
     searchitem.appendChild(magnifier);
-    navelements.appendChild(searchitem);
+    navelements.appendChild(searchitem);*/
     navbardiv.appendChild(navelements);
     fluiddiv.appendChild(navbardiv);
     navbar.appendChild(fluiddiv);
     navheader.appendChild(navbar);
     headerdiv.appendChild(navheader);
-    prependChild(document.body, headerdiv); */
+    prependChild(document.body, headerdiv);
 };
 
 /* function foot()