fixed a bug that was causing http client to fail on mac os x with
semaphore error
add back key support
Remove the protocol IAP Online
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Resolve the ndk build error.
Merge pull request #2379 from natural-law/master

issue #1723 : Remove the protocol IAP Online.
issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support.
Adding luajit iOS prebuilt library.
Updating Android.mk.
fix wrong buffer name
Properly resets the tile's Y flipping

This bug caused many tiles to be Y flipped if only one tile was actually intended to be flipped.
issue #1847: [iOS] Using LuaJit for HelloLua and TestLua.
issue #1847: Fix a typo in Ball.lua and Paddle.lua.
issue #1847: Updating Info.plist for TestLua, the package was updated: org.cocos2d-x.TestLua -> org.cocos2dx.TestLua.
issue #1847: Updating multi-platform-lua/proj.ios/HelloLua.xcodeproj.
issue #1847: Adding luajit library for win32.
update keypad support
issue #1847: Using luajit for win32.
fixed #1847: Updating template for iOS.
fixed #1847: -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1,
-DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.