Merge remote-tracking branch 'origin/marco-rodriguez' into marco-rodriguez

Conflicts:
	Figuras/EntitiesLayer/Figura.cs
	Figuras/EntitiesLayer/Triangulo.cs