Squashmerged rails4 on top of next

Conflicts:
	Gemfile
	Gemfile.lock