fix some windows compile warnings
Merge branch 'develop' into fix/compile_warnings

Conflicts:
	src/openms/source/FORMAT/XTandemXMLFile.cpp
Merge pull request #1115 from timosachsenberg/fix/compile_warnings

fix some windows compile warnings