up
get region code with ip
Merge branch 'master' of github.com:Bluehats/Cuanto-Debemos

Conflicts:
	app/views/layouts/_footer.html.erb
redirect to state
Merge branch 'featured/location-by-ip'