added non-prompt J/psi gen fragment
Merge pull request #1630 from lucamartini/nonprompt-Jpsi

added non-prompt J/psi gen fragment
Merge remote-tracking branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X