Merge branches 'dev' and 'dev_eddie' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_eddie

# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateGroupController.java
#	atms-api/src/main/java/pwc/taxtech/atms/dao/CellTemplateConfigMapper.java
#	atms-api/src/main/java/pwc/taxtech/atms/service/TemplateGroupService.java
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
#	atms-api/src/main/resources/pwc/taxtech/atms/dao/CellTemplateConfigMapper.xml