updated rails to 3.2.11
Merge branch 'rails-security-fixes'

Conflicts:
	Gemfile.lock