merge cm-4 to dev_1.0

Modified the dropping of candies
Fixed the candy at first shoot