Added surfaced dependent sound for the footsteps
Fixed conflicts