Update rails gem to 3.2.11 due to security risks.

Conflicts:
	Gemfile.lock
Update CHANGELOG.
Merge changelog with stable.