updated cmssw version
Merge commit '042f000d85148f07c8c09f9fc955b0d8707064b9'

Conflicts:
	setup.sh