updated for XML changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AssignIntensities.py
	PepXML2Csv.py
	PepXMLFilter.py
	ProtXML2Csv.py
	ProtXMLFilter.py
	utils.py