Completed template management
Merge branch 'master' of https://github.com/thelia/thelia