Fix an arrangement issue of Townsmen for DAI, Qiang
Merge branch 'feature-townsmen' into develop
Merge branch 'develop' of https://github.com/balloonsys/LifeAssistant into develop