adding template retriever for dist build
Merge branch 'master' into integratingFormBuilder