Devel and bugfixes
Merge branch 'devel_new_templates' of github.com:peruzzim/UserCode into devel_new_templates

Conflicts:
	diphoton/template_production.C