added template list management
Merge branch 'master' of https://github.com/sildar/TASER