Making TriggerTree address setting cleaner
Rolling back the format change (Photon conversion track indices)
Bug fix for SetBranchAddress in SusyEvent.cc + Rolling back the format change in Photon (conversion track references)
Merge branch 'master' of git://github.com/CMSSUSYPhotons/SUSYPhotonAnalysis
Merge branch 'master' of github.com:CMSSUSYPhotons/SUSYPhotonAnalysis

Conflicts:
	SusyNtuplizer/runOverAOD_CommandLine.py