resolved schema conflicts.
Merge branch 'adresses'

Conflicts:
	db/schema.rb