Added template repository
Added extension
Merge branch 'feature/templates' into development