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

Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb

@@ -1,6 +1,4 @@
-class Panel::WebResource::BackEnd::WebLinkCategorysController < ApplicationController
-  
-  layout 'new_admin'
+class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendController
   
   def index
     @web_link_categorys = WebLinkCategory.all

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

@@ -1,7 +1,4 @@
-class Panel::WebResource::BackEnd::WebLinksController < ApplicationController
-
-  
-  layout 'new_admin'
+class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
   
   before_filter :authenticate_user!
   before_filter :is_admin?

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb

@@ -2,7 +2,7 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController
   
   def initialize
     super
-    @app_title = NewBlog::MOUDLEAPP_TITLE
+    @app_title = 'web_resource'
   end
   
   # GET /web_links

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb

@@ -2,7 +2,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
 
   def initialize
     super
-    @app_title = NewBlog::MOUDLEAPP_TITLE
+    @app_title = 'web_resource'
   end
   
   # GET /web_links