Profile -> template
Fixed some errors
Merge branch 'master' of https://github.com/dswd/ToMaTo