Conflicts:
	activesupport/lib/active_support/callbacks.rb

Comment for active_support's option in application.rb

This reverts commit 667d0bdd, reversing
changes made to 4ae6bab6.

Closes #6274

mispelling errors in render_text_test.rb

Add commas missing in performance tests

Object#try can't call private methods

refactored extracting :size => 'XxY' into an extract_size! method

mispelling error in actionpach changelog

Add #nodoc to initialize_dup and use :method: to document the #dup method.
Relates to issue #6235

Makes it consistent with Relation. Can't see a use for this.

require 'action_view' is now much faster