Added managment for templates. Fixes #12