Upgrade to Rails 3.2.11 and Devise 2.2.0
Merge ../x0y0

Conflicts:
	Gemfile
	Gemfile.lock