Major class renaming because I can
Merge branch 'Ladron' into develop

Conflicts:
	CarmenSanDiegoClassDiagram.jpg
	CarmenSanDiegoClassDiagram.ucls
	src/fiuba/algo3/Common/GonXStreamReader.java
merging