Reorder address fields. Fixes #180.
Merge branch 'master' of https://github.com/OSTraining/Simplerenew

git commit -m "Reorder address fields. Fixes #180."