Final Changes for SiStrip noise treatment

Conflicts:
	SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
	SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py
	SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py
	SimGeneral/MixingModule/python/stripDigitizer_cfi.py
fix compile problem