City autocomplete finally done
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/orders_controller.rb
Fast merge fix.