bug fix in addresses_controller.rb
Merge branch 'master' into releases