template directory st ructure
Merge branch 'master' into development