way
Merge remote-tracking branch 'origin/checkout-way' into dev

Conflicts:
	app/models/city.rb