Added address field to location_settings views and edits
merge conflict fix
db/schema.rb merge conflict fixed
db/schema.rb merge conflict fixed
Merge pull request #77 from JustAboutJeff/address_field

Added address field to location_settings views and edits