Updated config files
Merge branch 'branch_42X_noEDM' of github.com:ETHZ/ASAnalysis into branch_42X_noEDM

Conflicts:
	PablosRunManagerPlus/template_data.cfg