edited location model

	modified:   app/views/devise/mailer/confirmation_instructions.html.erb
added country routes and links, locations index
merges