Fixing issue with setting template when creating component
Merge branch 'develop'