Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua

Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb

app/controllers/desktop_appstore_controller.rb

@@ -8,6 +8,10 @@ class DesktopAppstoreController< ApplicationController
 		render "desktop/appstore/widgets", :layout => false
 	end
 
+	def onlinestore
+		render "desktop/appstore/onlinestore", :layout => false
+	end
+
 	def getuserwidgets
 		@widgets = current_user.desktop.desktop_widgets
 		@groups = Array.new

app/controllers/desktop_publications_controller.rb

@@ -11,20 +11,8 @@ class DesktopPublicationsController< ApplicationController
     	render "desktop/journal_pages/add", :layout => false
   	end
 
-    def books
-      render "desktop/books", :layout => false
-    end
-
-    def books_list
-        render "desktop/books/list", :layout => false
-    end
-
-    def books_add
-       render "desktop/books/add", :layout => false
-    end
-
   	def create_journal
-  		Journal.create(user_id: current_user.id, title: "2012, Javascript")
+  		Journal.create(user_id: current_user.id, title: "Google")
   		b = Array.new
     	b << {"success"=>"true"}
     	render :json=>b.to_json
@@ -39,4 +27,12 @@ class DesktopPublicationsController< ApplicationController
   		end
   		render :json=>data.to_json
   	end
+
+    def delete_journal
+      @journals = Journal.find("")
+      @journals.delete
+      b = Array.new
+      b << {"success"=>"true"}
+      render :json=>b.to_json
+    end
 end