Updated replace in files
Merge branch 'master' of github.com:mlorbetske/template-builder into mlorbetske-master