Updating scripts and answers
Merge branch 'master' of github.com:pfs/sm_cms_das

Conflicts:
	test/wz_answers/macroTemplate_AllSamples_save.py
	test/wz_answers/macroTemplate_AllSamples_save_extended.py