qqq
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Prestamos/Entities/PrestamosCuotas.php
	app/Prestamos/Repositories/PrestamosCuotasRepo.php
	app/Socios/Entities/Socios.php
	app/Ventas/Repositories/VentasCuotasRepo.php
	app/controllers/Prestamos/PrestamosController.php
	app/controllers/Ventas/VentasController.php
	app/views/prestamos/create.blade.php
	app/views/socios/contenido_tabs/formulario.blade.php
	composer.json
	composer.lock
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Prestamos/PrestamosController.php
	app/views/prestamos/create.blade.php
qqq