Rails upgrade to 3.2.12 and Bootstrap to 2.3.0
Merge ../x0y0

Conflicts:
	Gemfile.lock