Merge pull request #207 from sharoonthomas/develop

Further refactoring of templates
Release version 3.2.1.10
Merge branch 'release/3.2.1.10' into develop
Fix typo in edit link of address