add twig_replace
Merge branch 'master' of github.com:bubobox/template-bootstrap

* 'master' of github.com:bubobox/template-bootstrap:
  generate json template file that can be used in grunt twig to generate dev version of template
  new version of composer
  update template copy

Conflicts:
	Gruntfile.js
merge error
Merge branch 'master' of github.com:bubobox/template-bootstrap

* 'master' of github.com:bubobox/template-bootstrap:
  add widget.id object fix