Type on template not found exception
Merge branch 'master' of https://github.com/thelia/thelia
Fixed depracation of rewritten URL
Merge branch 'master' of https://github.com/thelia/thelia