ref #47, API documentation for address_attributes
Cleaned conflict remnants
Added back to top link