Merge branch 'master' into 'master'

Removed google search bar closes #16

Removed the google search bar as I suggested in issue #16

See merge request !8

templates/foot.tpl

@@ -3,9 +3,6 @@
 <div id="navigation">
 {include file="menu.tpl"}
 
-
-{include file="search.tpl"}
-
 {if $session->loggedin}
 	<div style="resize: both;">
 		{include file="feedback.tpl"}
@@ -29,7 +26,7 @@
 </div>
 
 {if $action=="edit"}
-        <!-- 
+        <!--
         <script language="javascript" type="text/javascript" src="{$baseurl}/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
         <script language="javascript" type="text/javascript" src="{$baseurl}/js/tiny_mce.js"></script>
         --!>