Rails upto 3.2.11

Conflicts:

	Gemfile
	Gemfile.lock