Fixed merge conflicts

app/helpers/application_helper.rb

@@ -431,6 +431,14 @@ module ApplicationHelper
 		_(*a)
 	end
 
+	def lookup_ip
+		if request.remote_ip == '127.0.0.1'
+			session['remote_ip'] || (session['remote_ip'] = open("http://checkip.dyndns.org").first.gsub(/^.*\s([\d\.]+).*$/s, '\1').gsub(/[^\.\d]/, ''))
+		else
+			request.remote_ip
+		end
+	end
+
 	def lookup_ip_location
 		if request.remote_ip == '127.0.0.1'
 			Geocoder.search(session['remote_ip'] || (session['remote_ip'] = open("http://checkip.dyndns.org").first.gsub(/^.*\s([\d\.]+).*$/s, '\1').gsub(/[^\.\d]/, ''))).first
@@ -492,6 +500,11 @@ module ApplicationHelper
 		subdomain == 'test'
 	end
 
+	def location(location)
+		territory = Carmen::Country.coded(location.country).subregions.coded(location.territory)
+		location.city + (territory ? ' ' + territory.name : '') + ', ' + Carmen::Country.coded(location.country).name
+	end
+
 	private
 		def _form_field(type, name, value, options)
 			if type == 'check_box'

app/helpers/bike_bike_form_helper.rb

@@ -93,6 +93,7 @@ module BikeBikeFormHelper
 	end
 
 	def country_select_tag(name, value, options={})
+		#options[:no_wrapper] = true
 		render_field(name, options = get_options(name, options), super(name, value, options), value)
 	end
 
@@ -292,7 +293,8 @@ module BikeBikeFormHelper
 		end
 
 		def render_field(type, name, options, html, value = nil)
-			if (options.has_key?(:no_wrapper) && options[:no_wrapper]) || options['type'] == 'hidden'
+			options.symbolize_keys!
+			if (options.has_key?(:no_wrapper) && options[:no_wrapper]) || /country/.match(name.to_s) && /^subregion_select/.match(type.to_s) || options[:type] == 'hidden'
 				return html
 			end
 
@@ -306,7 +308,7 @@ module BikeBikeFormHelper
 			template = template_exists?(type) ? type : 'default'
 			params[:label_template] = options[:label] === false ? nil : get_label_template(type, options)
 			params[:label_position] = options[:label] === false ? :none : label_position(type, options)
-			
+
 			render(template, params)
 		end