Update templates
Merge branch 'master' of github.com:AVVSDevelopment/avvs.co