Finished Base javadoc
Finished Cheat javadoc
Finished Jugador javadoc
Finished Mesa Javadoc
Finished Personaje Javadoc
Finished Upgrade, SitNConquer, and Constantes javadoc
Merge origin/master
Conflicto con lo que ya había hecho ferrufino...
Conflicts:
	src/source/SitNConquer.java