Merge branch 'master' into Feat--Templates
Project loopz
Merge branch 'Feat--Templates'