Merge branch 'master' of https://github.com/ttbarMET-at-IPHC/Stops-AN-14-067

Conflicts:
	cutAndCountDefinitions.h
trying to fix conflicts in cutAndCountDefinitions.h
Small fixes to be able to compile