'Finalizacion del objeto servicioDeLeasing y pago de leasing'
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/Compania.java
	src/main/java/com/ts/libraries/Pago.java
	src/test/java/com/ts/main/TestDeLogicaDeNegocios.java
'Finalizacion de Leasign y asignacion del mismo al vehiculo'
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/CertificadoALaVista.java
	src/main/java/com/ts/libraries/HistoricoDeAsignacionesDeColaboradores.java
	src/main/java/com/ts/libraries/Vehiculo.java
	src/test/java/com/ts/main/TestDeLogicaDeNegocios.java