Rails 4.0.3 migration
Merge ../x0y0

Conflicts:
	Gemfile.lock