steerable pyramid is working
fixed conflicts for steerable pyramid update