issue #2404:replace deprecated functions in testlua and hellolua sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
issue #2404:replace some deprecated enums using in the lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
issue #2404:del a deprecated func
issue #2404:Modify tab to spaces
issue #2404:modify a function name to isSwallowsTouches()
Update class ProtocolAds to compatible with more Ads SDKs.
Update the JS binding for the change of class ProtocolAds.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3271 from natural-law/develop

Update class ProtocolAds to compatible with more Ads SDKs.
Merge pull request #3268 from samuele3hu/deprectedOperator

issue #2404:replace deprecated functions in testlua and hellolua sample
issue #2430: Fixing a typo.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor

Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
Updating LuaCocos2d.cpp