More relaxed rails requirement
Merge ../x0y0

Conflicts:
	Gemfile.lock