Update instructions to CMSSW_7_0_6
update
correcting typo
Merge remote-tracking branch 'upstream/master' into dev_photonPreselection