new orbit bar fixed..

Conflicts:
	app/assets/javascripts/orbit_js_1.0.1-front-end.js
	app/assets/stylesheets/basic/orbit_bar.css.erb
	app/assets/stylesheets/orbit_bar_bootstrap.css
	app/views/layouts/_left_menu.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_right_menu.html.erb
	app/views/layouts/desktop.html.erb

app/views/layouts/_right_menu.html.erb

@@ -10,7 +10,6 @@
         <input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
         <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
         <%= text_field_tag 'q','', {:class => "search-query input-medium", :placeholder => t(:search_google), 'x-webkit-speech' => ''} %>
-      </form>
     </li>
 
     <!-- Language -->

app/views/layouts/desktop.html.erb

@@ -13,10 +13,8 @@
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
-	<%= stylesheet_link_tag "desktop/desktop" %>
-	<%= javascript_include_tag "desktop/desktop" %>
-	<%= yield :page_specific_css %>
-	<%= yield :page_specific_javascript %>
+	<%= stylesheet_link_tag "desktop" %>
+	<%= javascript_include_tag "desktop" %>
 	<%= csrf_meta_tag %>
 </head>
 <body>