Merge branch 'master' into ldap

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_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

@@ -1,11 +1,12 @@
 source 'http://rubygems.org'
 gem 'rails', '>=3.1.0', '<3.2.0'
 
+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
 gem 'execjs'
 gem 'jquery-rails'
@@ -14,7 +15,9 @@ gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 gem 'mini_magick'
 gem 'mongoid'
+gem "mongo_session_store-rails3"
 gem 'mysql2'
+gem "net-ldap", "~> 0.3.1"
 gem 'radius'
 gem 'rake'
 gem 'ruby-debug19'
@@ -22,7 +25,7 @@ gem 'rubyzip'
 gem 'sinatra'
 gem 'sprockets'
 gem 'tinymce-rails'
-gem 'therubyracer'
+gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")