Update templates
Merge branch 'Zhaodong'