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 pull request #12 from CMSSUSYPhotons/master

Merging the accidental commits