Update rails to 3.2.20
Merge branch 'master' into stable

Conflicts:
	Gemfile