Update ruby and rails

Conflicts:
	Gemfile.lock
Update gems