merge
fixed mergeconficts
transform sdh_palm-arm7 added - still problems with lookupTransform