Updated from Rails 3.2.8 to 3.2.10.

Conflicts:

	Gemfile.lock