gulped on dec 22
Merge branch 'dev'
testing location of templates to dist folder
testing file location
trying to add template and library folders to gulp
merged with deploy-testing