Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	app/controllers/auth/confirmations_controller.rb

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/controllers/auth/confirmations_controller.rb
index 5ffa1c9a307c237522a8d0671e17f25f80ddad95,2fdb281f40e87be38aeeac5e4118b88a24873a0c..72b8e9dd873aeee70e23a7de796d3d2ee14903d8
--- 1/app/controllers/auth/confirmations_controller.rb
--- 2/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@@ -2,17 -2,4 +2,12 @@@
  
  class Auth::ConfirmationsController < Devise::ConfirmationsController
    layout 'auth'
-   def show
-     super do |user|
-       BootstrapTimelineWorker.perform_async(user.account_id) if user.errors.empty?
-     end
-   end
-   
++
 +  before_action :set_pack
 +
 +  private
 +
 +  def set_pack
 +    use_pack 'auth'
 +  end
  end

diff --cc app/models/status.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/ko.yml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc config/settings.yml
Simple merge