A cut-based AgainstElectron2 discriminat added
Merged CMSSW_7_0_X_taus from repository mbluj
tried to integrate new UCT2015 version (including 4x4, 2x1, 4,8)