fixed compilation errors in osx
support for zlib decompression of mzXML peak data
Merge branch 'master' of github.com:eugenemel/MAVEN
projects load in background.
stubs for integration
new buttons to check and uncheck samples, and to remove samples
Merge branch 'master' of https://github.com/eugenemel/MAVEN
basic MS1 integration of MS2 events
more work on integration of MS2
minor
statbility bugs during MS2 quant
Merge branch 'master' of github.com:eugenemel/MAVEN

Conflicts:
	mzroll/spectralhitstable.cpp
Merge branch 'master' of github.com:eugenemel/MAVEN

Conflicts:
	mzroll/spectralhitstable.cpp
improved background color in spectralhits and peaktables
emit progress bar calls from spectralhit widget
Merge branch 'master' of https://github.com/eugenemel/MAVEN
Merge branch 'master' of https://github.com/eugenemel/MAVEN
improve peakdetector user interface
further improvements to peakdetector ui
Merge branch 'master' of https://github.com/eugenemel/MAVEN