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

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb

vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb

@@ -1,12 +0,0 @@
-class Panel::NewBlog::Widget::PostsController < \"
-  # GET /posts
-  # GET /posts.xml
-  def index
-    @posts = Post.all
-  end
-  
-  def latest_post
-    @post = Post.all.last
-  end
-
-end

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

@@ -1,5 +1,4 @@
 class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
-  
   def initialize
     super
     @app_title = 'web_resource'