minor
Merge branch 'master' of github.com:eugenemel/MAVEN

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

Conflicts:
	mzroll/spectralhitstable.cpp