Fixing issue with templates not showing up for new components
Merge branch 'develop'