fixed several things in templates
Merge branch 'master' of https://github.com/spencer1992/MAIN

ommitting some changes