Updated templates
Merge branch 'master' of ssh://ccr-git/RWC/TEST/git/vim