update gems and rails

Conflicts:
	Gemfile.lock