'select2' minor update

Conflicts:
	app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak

app/views/layouts/desktop.html.erb

@@ -13,14 +13,13 @@
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
-	<%= stylesheet_link_tag "desktop" %>
-	<%= javascript_include_tag "desktop" %>
+	<%= stylesheet_link_tag "desktop/desktop" %>
+	<%= javascript_include_tag "desktop/desktop" %>
 	<%= yield :page_specific_css %>
 	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
 </head>
 <body>
-	<%= render 'layouts/orbit_bar' %>
 	<%= yield %>
 </body>
 </html>