documentacion
Merge remote-tracking branch 'origin/master'

Conflicts:
	ServerApplication/src/serverapplication/XMLParser.java
	ServerApplication/src/serverapplication/XMLSender.java