need to commit
Merge branch 'v3' of https://github.com/xinxu/cocos2d-x into v3
Merge branch 'v3' of https://github.com/xinxu/cocos2d-x into v3
Merge branch 'v3' of https://github.com/xinxu/cocos2d-x into v3
Statistics.h
Merge branch 'v3' of https://github.com/xinxu/cocos2d-x into v3