Government includes guerrillas in Justice and Peace laws