update template copy
new version of composer
generate json template file that can be used in grunt twig to generate dev version of template
Merge branch 'feature-template-json'

* feature-template-json:
  generate json template file that can be used in grunt twig to generate dev version of template
fix merge conflict