fix(build): Templates and JS builded together
Merge branch 'hotfix/build-templates'