Ignore templates.js
Merge branch 'dev' of github.com:etsisk/dna_template into dev