Merge pull request #7274 from Dhilan007/v3-320beta

fixed crash cause by addChild on win 7.
fix compiling error
Merge pull request #7276 from minggo/v3

fix compiling error