Merge pull request #11 from cms-sw/CMSSW_7_0_X

Sync with official-CMSSW
Try to see if this fixes the x-axis direction
Merge pull request #10 from dildick/fixingTheGEMFrameRotationInSimG4cms

Fixing the gem frame rotation in sim g4cms