merge some quarx2k and cm source to diffrent branch