update to Rails 3.2.19
Merge branch '1.5-stable'

Conflicts:
	Gemfile
	Gemfile.lock