Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad

Conflicts:
	config/mongoid.yml

app/controllers/admin/assets_controller.rb

@@ -35,7 +35,7 @@ class Admin::AssetsController < OrbitBackendController
       respond_to do |format|
         format.js {
           if params[:uploader]
-            render 'create'
+            render "create"
           else
             render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil}
           end

app/controllers/desktop_controller.rb

@@ -1,4 +1,3 @@
-
 class DesktopController< ApplicationController
   layout 'desktop'
   before_filter :authenticate_user!

app/controllers/desktop_research_controller.rb

@@ -0,0 +1,26 @@
+class DesktopResearchController< ApplicationController
+
+	def research_d
+		render "desktop/research_d", :layout=>false
+	end
+	def research_d_list
+		render "desktop/research_domain/list", :layout=>false
+	end
+
+	def research_d_add
+		render "desktop/research_domain/add", :layout=>false
+	end
+
+	def research_p
+		render "desktop/research_p", :layout=>false
+	end
+	def research_p_list
+		render "desktop/research_project/list", :layout=>false
+	end
+
+	def research_p_add
+		render "desktop/research_project/add", :layout=>false
+	end
+
+
+end

app/controllers/gridfs_controller.rb

@@ -3,7 +3,7 @@ require 'mongo'
 class GridfsController < ActionController::Metal
   
   def serve
-    gridfs_path = env["PATH_INFO"].gsub("/gridfs/", "").force_encoding("UTF-8")
+    gridfs_path = (params[:path]+'.'+params[:format]).gsub("/gridfs/", "").force_encoding("UTF-8")
     begin
       gridfs_file = Mongo::GridFileSystem.new(Mongoid.database).open(gridfs_path, 'r')
       self.response_body = gridfs_file.read