Update Getting Started Guide - Strong Parameters [ci skip]
	modified:   guides/source/getting_started.md
Override Time.at to work with Time-like values

Time.at allows passing a single Time argument which is then converted
to an integer. The conversion code since 1.9.3r429 explicitly checks
for an instance of Time so we need to override it to allow DateTime
and ActiveSupport::TimeWithZone values.
Merge pull request #10710 from senny/5554_let_the_database_raise_on_counts

Remove column restrictions for `#count`, let the database raise if the SQL is invalid.
Conflicts:
	activerecord/CHANGELOG.md
Don't blindly call blame_file! on exceptions in ActiveSupport::Dependencies::Loadable

It is possible under some environments to receive an Exception that is
not extended with Blamable (e.g. JRuby).
ActiveSupport::Dependencies::Loadable#load_dependency blindly call
blame_file! on the exception which throws it's own NoMethodError
exception and hides the original Exception.

This commit fixes #9521
Use sprockets-rails 2.0.0
Use sass-rails 4.0.0.rc2
Keep sub-second resolution when wrapping a DateTime value

Add `DateTime#usec` and `DateTime#nsec` so that `ActiveSupport::TimeWithZone`
keeps sub-second resolution when wrapping a `DateTime` value.

Fixes #10855
Revert "Keep sub-second resolution when wrapping a DateTime value"

This reverts commit a08d3c9bc1f8f60a27f8cc1abe774c644f20b1a9.
Merge pull request #10841 from latortuga/fix-underscore-dependency-tracking

Fix mismatching variable names when using an underscore
Describe ActiveSupport core extensions for BigDecimal, JSON support, and instance variable names.
copy editing AS guide [ci skip]
Use DatabaseTasks.env instead of Rails.env in databases.rake
Properly namespace DatabaseTasks
Merge pull request #10950 from appscape-forks/fix-wrong-method-name

Fix wrong method name
Merge pull request #10924 from pjg/patch-1

Grammar fix [ci skip]
Merge pull request #10925 from senny/10917_test_to_prevent_regression

regression test + mysql2 adapter raises correct error if conn is closed.
Conflicts:

	activerecord/CHANGELOG.md
:scissors:

[ci skip]
Wrap text on 80 columns

This make easier to review the source file

[ci skip]
Merge pull request #10727 from pacoguzman/fix-xml-mini-tests

Fix XmlMini different backends tests
Merge pull request #10960 from pacoguzman/fix-build-due-to-10727

Fix build after #10727