Hydjet2
Merge branch 'CMSSW_7_3_X' of github.com:wouf/cmssw into CMSSW_7_3_X