[JSB] Mark cc.TMXTiledMap.propertiesForGID to deprecated method.
Merge pull request #3313 from dumganhar/develop

[JSB] Mark cc.TMXTiledMap.propertiesForGID to deprecated method.
Updating JS-Test.
Merge pull request #3314 from dumganhar/develop

Updating JS-Test.
Update the JS binding code of plugin.
Modify ActionTest sample of lua to add draw functions
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop
Merge pull request #3315 from natural-law/develop

Update the JS binding code of plugin.
Merge pull request #3316 from samuele3hu/TestDevelop

Modify ActionTest sample of lua for adding draw functions
[Tizen] Re-add missing files for CocosDenshion.
Fixing warnings  of the order of member variables and fixing errors for tizen projects.
Updating JS-Test, fixing CrystalCraze crash on android and windows.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into member-var-init
issue #2437: Fix Bug RenderTextureTestDepthStencil not clipped by stencil
close #2437: replace stencil mechanism with a new approach by removing glColorMask call
[Android] Fixing build errors for ndk-r9.
Merge pull request #3319 from dumganhar/android-ndk-r9-fix

[Android] Fixing build errors for ndk-r9.
Remove the deprecated methods.
Merge pull request #3320 from natural-law/develop

Remove the deprecated methods.
Merge pull request #3317 from dumganhar/member-var-init

Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.