closed #2393:fix a bug caused by marking functions as deprecated
Merge pull request #3220 from minggo/develop

closed #2393:fix a bug caused by marking functions as deprecated
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2378-remove-CC_PROPERTY