updated templates and protections

Conflicts:
	width_datacardClass2DNew.py
Merge branch 'master' of https://github.com/HZZ4l/CreateWidthDatacards