Rails 4.0.4
Merge ../x0y0

Conflicts:
	Gemfile.lock