ADD_ParserXML
Merge remote-tracking branch 'origin/master'

Conflicts:
	ServerApplication/src/serverapplication/Server.java