some more clean up (code review)
Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge
Merge pull request #3364 from dumganhar/carlomorgantinizynga-new_develop_merge

Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342, some more clean up (code review)