merge everything to vunlin

end of CNA development