ultimate
Merge branch 'master' of https://github.com/ReyesMagos/Inmovic2

Conflicts:
	src/co/gov/dps/inmovic/presentacion/vistas/vistabien/Resultados.java