Update template (part1)
Merge pull request #1893 from 810/feature-hmvc

Update template (part1)