Creating template
Merge branch 'master' of ssh://p4-wilburzhao.rhcloud.com/~/git/p4