(CS-5496) Move templates service from classes construct
Merge pull request #806 from takeit/master

(CS-5496) Move templates service from classes construct