added fields to country and state

fixed select
fixed select for address in company

fixed address show in company show
Merge branch 'added_fields_to_country_and_state'

Conflicts:
	db/seeds.rb