Merge branch 'ruby-2.1'

Conflicts:
	app/assets/javascripts/comments.js
	app/helpers/delayed_jobs_helper.rb

config/application.rb

@@ -21,4 +21,6 @@ module Danbooru
     config.action_mailer.perform_deliveries = true
     config.log_tags = [lambda {|req| "PID:#{Process.pid}"}]
   end
+
+  I18n.enforce_available_locales = false
 end