Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 gem 'rails', '>=3.1.0', '<3.2.0'
 
 gem "brakeman"
+gem 'mime-types'
 
 gem 'bson_ext'
 gem 'carrierwave'
@@ -24,6 +25,7 @@ gem "mongo_session_store-rails3"
 gem 'mysql2'
 gem 'nokogiri'
 
+
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'
@@ -74,7 +76,8 @@ group :test, :development do
   gem 'pry-remote'
   gem 'pry-stack_explorer'
   gem 'pry-debugger'
-  
+  gem 'faker'
+
   gem "sunspot-rails-tester"
   gem 'spork'
   gem 'database_cleaner'  #Strategies for cleaning databases. Can be used to ensure a clean state for testing.