Rearrange address

Change route and streetNumber order, to be displayed in the US format
Merge remote-tracking branch 'upstream/master'