Merge upstream/master

Conflicts:
	TenisApp/src/tenis/app/Main.java
	TenisApp/src/tenis/logic/LogicControllerMODIFICADO.java
	TenisApp/src/tenis/logic/PaintAdministrator.java
	TenisApp/src/tenis/views/MainWindow.java