correccion en log4j.properties
resolved conflict when merge branches.