added shifted beamspot
Merge pull request #6790 from civanch/shifted_beam_spot

added shifted beamspot
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X