Merge branch 'desktop_devin' into desktop_joshua

config/routes.rb

@@ -164,13 +164,15 @@ Orbit::Application.routes.draw do
 
   match '/desktop_appstore/appstore'=>'desktop_appstore#appstore'
   match '/desktop_appstore/widgets'=>'desktop_appstore#widgets'
+  match '/desktop_appstore/onlinestore'=>'desktop_appstore#onlinestore'
   match '/desktop_appstore/getuserwidgets'=>'desktop_appstore#getuserwidgets'
   match '/desktop_appstore/widgets_settings'=>'desktop_appstore#widgets_settings'
 
   match '/desktop_orbit/orbit' => 'desktop_orbit#orbit'
   match '/desktop_orbit/getevents' => 'desktop_orbit#getevents'
    #match '/desktop_orbit/getevents' => 'desktop_publications#create_journal'
-    
+  #match '/desktop_orbit/getevents' => 'desktop_publications#delete_journal'
+
   match '/desktop/temp_func/'=>'desktop#temp_func'
   
   match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|