cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	user/css/estilos.css
	user/index.php
	user/js/ajaxBusqueda.js
	user/php/consultaCartasAsig.php