Template Update
Template Update
Merge branch 'master' of https://github.com/demohi/tongzai

Conflicts:
	.idea/workspace.xml