finish Townsmen module
Merge branch 'feature-townsmen' into develop
fix merge conflicts issue