Colombia presents policy to end guerrilla and neo-paramilitary presence