ActiveSupport::OrderedHash did not behave identically to Hash when given
a block with a splat.

use association_primary_key in AssociationScope#add_constraints

Resolve issue #534

MassAssignmentSecurity: add ability to specify your own sanitizer

AR Serialization shouldn't fall back to base opts for includes

Conflicts:

	activerecord/lib/active_record/serialization.rb

Added an ability to specify your own behavior on mass assingment
protection, controlled by option:
ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer

Cleanup engine generator

Don't raise an exception if the format isn't recognized

Fixed while traveling to heuruko

Removed unnecessary space in application.rb

Updating Railties changelog

Removed deprecated methods and related tests from ActiveSupport

action_view/template/handler.rb has been removed

Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb

removed deprecated methods, and related tests, from ActiveRecord

Ensure RDoc::Task exists even if 'rdoc/task' was not required

Minor indentation fix in code_statistics