Merge branch 'hotfix/2.4.1'
Merge branch 'release/2.5.0'
Fix nil error for county name on town show view

Remove commented code
Merge branch 'hotfix/2.5.1' into develop