improvments to peak integration
add isotope peak intensity
Merge branch 'master' of https://github.com/eugenemel/MAVEN

Conflicts:
	integrateMS1/integrateMS1.cpp