Make template "delete" button work
Merge branch 'master' of https://github.com/corydoras/Base