issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
Also added more deprecated constants.
issue #2430: Fixing conflicts.
Merge pull request #3283 from dumganhar/iss2430-more-deprecated-fix

issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
fixes warnigns when using HttpRequest

fixes warnigns when using HttpRequest
Fix build with -Werror=format-security (default in Android NDK r9)
Fix build with -Werror=format-security (default in Android NDK r9)
Merge pull request #3288 from minggo/ndk-r9-fixes

Fix build with -Werror=format-security (default in Android NDK r9)
Merge pull request #3286 from ricardoquesada/http_warnings

fixes warnigns when using HttpRequest
[Mac] Adding resources for SimpleGame.
Merge pull request #3289 from dumganhar/develop

[Mac] Adding resources for SimpleGame.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode