Squash-rebased rails 4 on top of next

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/application/header/_user.html.haml