Handle multiple addresses
Correct lookup from an address
Change User navigation
Merge remote-tracking branch 'origin/master'