add templating service
Merge branch 'develop'