Agregado listar en característica
aaaa
Merge branch 'master3' of https://github.com/armandoSosa/inventario.git
into master3

Conflicts:
	target-eclipse/classes/com/redoaxaca/Caracteristica.class
	target-eclipse/classes/com/redoaxaca/CaracteristicaController.class
	target-eclipse/classes/com/redoaxaca/Departamento.class
	target-eclipse/classes/com/redoaxaca/Direccion.class
	target-eclipse/classes/com/redoaxaca/Estado.class
	target-eclipse/classes/com/redoaxaca/Municipio.class
	target-eclipse/classes/com/redoaxaca/Nivel.class
	target-eclipse/classes/com/redoaxaca/Objeto.class
	target-eclipse/classes/com/redoaxaca/ObjetoDepartamento.class
	target-eclipse/classes/com/redoaxaca/ObjetoPersona.class
	target-eclipse/classes/com/redoaxaca/Persona.class
	target-eclipse/classes/com/redoaxaca/Plantilla.class
	target-eclipse/classes/com/redoaxaca/Puesto.class
	target-eclipse/classes/com/redoaxaca/PuestoPersona.class
	target-eclipse/classes/com/redoaxaca/Telefono.class
	target-eclipse/classes/com/redoaxaca/Tipo.class
	target-eclipse/classes/com/redoaxaca/TipoPropiedad.class
	target-eclipse/classes/com/redoaxaca/TipoTelefono.class
	target-eclipse/classes/com/redoaxaca/Unidad.class
	target-eclipse/classes/com/redoaxaca/Valor.class