rename template
Merge origin/master