rename cube 1b to 1a
add zabr calibration to cms market,
include some changes form the cmsmarket branch