diff --git a/.gitignore b/.gitignore
index a6ee997aa..96788ad9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.swp
 /config/database.yml
 /config/configuration.yml
+/config/additional_environment.rb
 /files/*
 /log/*
 /public/tmp/*
diff --git a/Gemfile b/Gemfile
index 976184793..d5fe6c581 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,140 +1,141 @@
-source 'http://ruby.taobao.org'
-#source 'http://ruby.sdutlinux.org/'
-
-unless RUBY_PLATFORM =~ /w32/
-  # unix-like only
-  gem 'iconv'
-end
-
-gem 'rubyzip'
-gem 'delayed_job_active_record'#, :group => :production
-gem 'daemons'
-gem 'grape', '~> 0.9.0'
-gem 'grape-entity'
-gem 'seems_rateable', '~> 1.0.13'
-gem "rails", "3.2.13"
-gem "jquery-rails", "~> 2.0.2"
-gem "i18n", "~> 0.6.0"
-gem 'coderay', '~> 1.1.0'
-gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
-gem "builder", "3.0.0"
-gem 'acts-as-taggable-on', '2.4.1'
-gem 'spreadsheet'
-gem 'ruby-ole'
-#gem 'email_verifier', path: 'lib/email_verifier'
-gem 'rufus-scheduler'
-#gem 'dalli', path: 'lib/dalli-2.7.2'
-gem 'rails_kindeditor',path:'lib/rails_kindeditor'
-group :development do
-  gem 'grape-swagger'
-  #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
-  gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
-  gem 'pry-rails'
-  if RUBY_VERSION >= '2.0.0'
-    gem 'pry-byebug'
-  else
-    # gem 'pry-debugger'
-  end
-  gem 'pry-stack_explorer'
-  gem 'better_errors', '~> 1.1.0'
-  gem 'rack-mini-profiler', '~> 0.9.3'
-end
-
-group :test do
-  gem "shoulda", "~> 3.5.0"
-  gem "mocha", "~> 1.1.0"
-  gem 'capybara', '~> 2.4.1'
-  gem 'nokogiri', '~> 1.6.3'
-  gem 'factory_girl', '~> 4.4.0'
-  gem 'selenium-webdriver', '~> 2.42.0'
-
-  gem "faker"
-  # platforms :mri, :mingw do
-  #   group :rmagick do
-  #     # RMagick 2 supports ruby 1.9
-  #     # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-  #     # different requirements for the same gem on different platforms
-  #     gem "rmagick", ">= 2.0.0"
-  #   end
-  #end
-end
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-   gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.0.3'
-end
-
-# Optional gem for LDAP authentication
-group :ldap do
-  gem "net-ldap", "~> 0.3.1"
-end
-
-
-# Optional gem for OpenID authentication
-group :openid do
-  gem "ruby-openid", "~> 2.1.4", :require => "openid"
-  gem "rack-openid"
-end
-
-# Optional gem for exporting the gantt to a PNG file, not supported with jruby
-platforms :jruby do
-  # jruby-openssl is bundled with JRuby 1.7.0
-  gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
-  gem "activerecord-jdbc-adapter", "1.2.5"
-end
-
-# Include database gems for the adapters found in the database
-# configuration file
-require 'erb'
-require 'yaml'
-database_file = File.join(File.dirname(__FILE__), "config/database.yml")
-if File.exist?(database_file)
-  database_config = YAML::load(ERB.new(IO.read(database_file)).result)
-  adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
-  if adapters.any?
-    adapters.each do |adapter|
-      case adapter
-      when 'mysql2'
-        gem "mysql2", "= 0.3.18", :platforms => [:mri, :mingw]
-        gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-      when 'mysql'
-        gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
-        gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-      when /postgresql/
-        gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
-        gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
-      when /sqlite3/
-        gem "sqlite3", :platforms => [:mri, :mingw]
-        gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-      when /sqlserver/
-        gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw]
-        gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
-      else
-        warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
-      end
-    end
-  else
-    warn("No adapter found in config/database.yml, please configure it first")
-  end
-else
-  warn("Please configure your config/database.yml first")
-end
-
-local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
-if File.exists?(local_gemfile)
-  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(local_gemfile)
-end
-
-# Load plugins' Gemfiles
-Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
-end
+source 'http://ruby.taobao.org'
+#source 'http://ruby.sdutlinux.org/'
+
+unless RUBY_PLATFORM =~ /w32/
+  # unix-like only
+  gem 'iconv'
+end
+
+gem 'redis-rails'
+gem 'rubyzip'
+gem 'delayed_job_active_record'#, :group => :production
+gem 'daemons'
+gem 'grape', '~> 0.9.0'
+gem 'grape-entity'
+gem 'seems_rateable', '~> 1.0.13'
+gem "rails", "3.2.13"
+gem "jquery-rails", "~> 2.0.2"
+gem "i18n", "~> 0.6.0"
+gem 'coderay', '~> 1.1.0'
+gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
+gem "builder", "3.0.0"
+gem 'acts-as-taggable-on', '2.4.1'
+gem 'spreadsheet'
+gem 'ruby-ole'
+#gem 'email_verifier', path: 'lib/email_verifier'
+gem 'rufus-scheduler'
+#gem 'dalli', path: 'lib/dalli-2.7.2'
+gem 'rails_kindeditor',path:'lib/rails_kindeditor'
+group :development do
+  gem 'grape-swagger'
+  #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
+  gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
+  gem 'pry-rails'
+  if RUBY_VERSION >= '2.0.0'
+    gem 'pry-byebug'
+  else
+    # gem 'pry-debugger'
+  end
+  gem 'pry-stack_explorer'
+  gem 'better_errors', '~> 1.1.0'
+  gem 'rack-mini-profiler', '~> 0.9.3'
+end
+
+group :test do
+  gem "shoulda", "~> 3.5.0"
+  gem "mocha", "~> 1.1.0"
+  gem 'capybara', '~> 2.4.1'
+  gem 'nokogiri', '~> 1.6.3'
+  gem 'factory_girl', '~> 4.4.0'
+  gem 'selenium-webdriver', '~> 2.42.0'
+
+  gem "faker"
+  # platforms :mri, :mingw do
+  #   group :rmagick do
+  #     # RMagick 2 supports ruby 1.9
+  #     # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+  #     # different requirements for the same gem on different platforms
+  #     gem "rmagick", ">= 2.0.0"
+  #   end
+  #end
+end
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+   gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+# Optional gem for LDAP authentication
+group :ldap do
+  gem "net-ldap", "~> 0.3.1"
+end
+
+
+# Optional gem for OpenID authentication
+group :openid do
+  gem "ruby-openid", "~> 2.1.4", :require => "openid"
+  gem "rack-openid"
+end
+
+# Optional gem for exporting the gantt to a PNG file, not supported with jruby
+platforms :jruby do
+  # jruby-openssl is bundled with JRuby 1.7.0
+  gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
+  gem "activerecord-jdbc-adapter", "1.2.5"
+end
+
+# Include database gems for the adapters found in the database
+# configuration file
+require 'erb'
+require 'yaml'
+database_file = File.join(File.dirname(__FILE__), "config/database.yml")
+if File.exist?(database_file)
+  database_config = YAML::load(ERB.new(IO.read(database_file)).result)
+  adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
+  if adapters.any?
+    adapters.each do |adapter|
+      case adapter
+      when 'mysql2'
+        gem "mysql2", "= 0.3.18", :platforms => [:mri, :mingw]
+        gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+      when 'mysql'
+        gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
+        gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+      when /postgresql/
+        gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
+        gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+      when /sqlite3/
+        gem "sqlite3", :platforms => [:mri, :mingw]
+        gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+      when /sqlserver/
+        gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw]
+        gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+      else
+        warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
+      end
+    end
+  else
+    warn("No adapter found in config/database.yml, please configure it first")
+  end
+else
+  warn("Please configure your config/database.yml first")
+end
+
+local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+if File.exists?(local_gemfile)
+  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(local_gemfile)
+end
+
+# Load plugins' Gemfiles
+Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
+end
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index f8d0f5dd1..22db3d5b4 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -332,7 +332,7 @@ class AccountController < ApplicationController
     token = Token.create(:user => user, :action => 'autologin')
     cookie_options = {
       :value => token.value,
-      :expires => 1.year.from_now,
+      :expires => 7.days.from_now,
       :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
       :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
       :httponly => true
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 4175282b3..bb289eb03 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -68,7 +68,7 @@
     <td align="left">
         <% if Setting.autologin? %>
         <label for="autologin">
-          <%= check_box_tag 'autologin', 1, false, :tabindex => 4 %>
+          <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
           <%= l(:label_stay_logged_in) %>
         </label>
         <% end %>
diff --git a/config/additional_environment.rb b/config/additional_environment.rb
deleted file mode 100644
index 6654da90f..000000000
--- a/config/additional_environment.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copy this file to additional_environment.rb and add any statements
-# that need to be passed to the Rails::Initializer.  `config` is
-# available in this context.
-#
-# Example:
-#
-#   config.log_level = :debug
-#   ...
-#
-#config.relative_url_root = '/socialforge'
diff --git a/config/application.rb b/config/application.rb
index 487223584..57ae436cb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,77 +1,75 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-require 'sprockets/railtie'
-
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
-
-module RedmineApp
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    #verifier if email is real
-   
-
-    config.generators do |g|
-         g.test_framework :rspec,
-         fixtures: true,
-         view_specs: false,
-         helper_specs: false,
-         routing_specs: false,
-         controller_specs: true,
-         request_specs: false
-         g.fixture_replacement :factory_girl, dir: "spec/factories"
-      end
-    # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    config.active_record.observers = :journals_for_message_observer, :issue_observer, :journal_observer, :wiki_content_observer
-
-    config.active_record.store_full_sti_class = true
-    config.active_record.default_timezone = :local
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = false
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-
-    config.action_mailer.perform_deliveries = false
-
-    # Do not include all helpers
-    config.action_controller.include_all_helpers = false
-
-    config.session_store :cookie_store, :key => '_redmine_session'
-
-    if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
-      instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
-    end
-
-  end
-end
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+require 'sprockets/railtie'
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module RedmineApp
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    #verifier if email is real
+   
+
+    config.generators do |g|
+         g.test_framework :rspec,
+         fixtures: true,
+         view_specs: false,
+         helper_specs: false,
+         routing_specs: false,
+         controller_specs: true,
+         request_specs: false
+         g.fixture_replacement :factory_girl, dir: "spec/factories"
+      end
+    # Custom directories with classes and modules you want to be autoloadable.
+    config.autoload_paths += %W(#{config.root}/lib)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    config.active_record.observers = :journals_for_message_observer, :issue_observer, :journal_observer, :wiki_content_observer
+
+    config.active_record.store_full_sti_class = true
+    config.active_record.default_timezone = :local
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = false
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+
+    config.action_mailer.perform_deliveries = false
+
+    # Do not include all helpers
+    config.action_controller.include_all_helpers = false
+
+    if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
+      instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
+    end
+
+  end
+end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 160e0b8b0..63931fa33 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -19,7 +19,12 @@ RedmineApp::Application.configure do
   # Full error reports are disabled and caching is turned on
   config.logger = Logger.new('log/production.log', 'daily',1048576) # daily, weekly or monthly
   config.action_controller.perform_caching = true
-  config.cache_store = :file_store,  "#{Rails.root }/files/cache_store/"
+
+  # to additional_environment.rb
+  # config.cache_store = :file_store,  "#{Rails.root }/files/cache_store/"
+  # config.cache_store = :redis_store, 'redis://localhost:6379/0/cache', { expires_in: 90.minutes  }
+  #
+ 
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host                  = "http://assets.example.com"