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