fix merge problems, drawing actions now in custom actions, pinch to zoom now in gestures