remove one sample
merge ccMoreTypes.h
merge CCMoreMacros.h