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

Gemfile

@@ -6,7 +6,6 @@ gem "brakeman"
 gem 'bson_ext'
 gem 'carrierwave'
 gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
-gem 'devise'
 gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
@@ -17,20 +16,21 @@ gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 gem 'mini_magick'
 gem 'mongoid'
-gem 'mysql2'
 gem "mongo_session_store-rails3"
+gem 'mysql2'
+gem "net-ldap", "~> 0.3.1"
 gem 'nokogiri'
 gem 'radius'
 gem 'rake'
 gem 'ruby-debug19'
 gem 'rubyzip'
+gem 'therubyracer'
 gem 'sinatra'
 gem 'sprockets'
 gem 'tinymce-rails'
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 
 
-
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do