issue #2378: ParticleTest: _emitter->getOpacityModifyRGB --> _emitter->isOpacityModifyRGB
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2378-remove-CC_PROPERTY
issue #2378: Compilation error fixes.
issue #2378: More override functions.
issue #2378: Mark getStoringCharacters as deprecated function.
issue #2378: Deprecating some getters. Getter function needs to have 'get' prefix.
Merge pull request #3228 from dumganhar/iss2378-remove-CC_PROPERTY

issue 2378: Removing CC_PROPERTY_XXX macros in engine.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3229 from CocosRobot/updategeneratedsubmodule_1374589966

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3221 from natural-law/develop

Add ProtocolSocial for social SDKs in plugin
Merge branch 'develop' into more_best_practices_fixes
More best practices fixes and other bug fixes

- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it.
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
Put the deprecated method 'CCLog' to 'CCDeprecated.h'.
issue #2426:Modify tab and spaces
More CCLog --> log.
Merge pull request #3231 from dumganhar/more_best_practices_fixes

Resolved compilation errors in PR https://github.com/cocos2d/cocos2d-x/pull/3216
Merge pull request #3214 from bmanGH/develop

修复CCTexturePVR创建GLTexture时没有使用GLStateCache