ayura
Alejo
restaurada la base culia
 pototpoto
Merge branch 'master' into dba

Conflicts:
	DB/PokemonUsuarios/db.lck
	DB/PokemonUsuarios/log/log.ctrl
	DB/PokemonUsuarios/log/log1.dat
	DB/PokemonUsuarios/log/logmirror.ctrl
	DB/derby.log
	DB/pokemdb/db.lck
	DB/pokemdb/log/log.ctrl
	DB/pokemdb/log/log3.dat
	DB/pokemdb/log/logmirror.ctrl
	DB/pokemdb/seg0/c10.dat
	DB/pokemdb/seg0/c150.dat
	DB/pokemdb/seg0/c161.dat
	DB/pokemdb/seg0/c171.dat
	DB/pokemdb/seg0/c230.dat
	DB/pokemdb/seg0/c241.dat
	DB/pokemdb/seg0/c251.dat
	DB/pokemdb/seg0/c90.dat
	DB/pokemdb/seg0/ca1.dat
	DB/pokemdb/seg0/cb1.dat
	build/built-jar.properties
	build/classes/Vista/VistaEquipo.form
arreglado?
 blabla