Merge origin/master

Conflicts:
	SOLSA/web/Cliente/Reporte.jsp