added windows keyboard support
issue #2243:Add a uniform fund in ScriptEngineProtocol
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
Merge pull request #3 from cocos2d/develop

sync with upstream (cocos2d/cocos2d-x)
Merge branch 'develop' of https://github.com/samuele3hu/cocos2d-x into execDev
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
PivotJoint class constructor will now take 3 or 4 arguments like in html5
pointQueryFirst in Space class returns invalid Shape when a shape is not found
fixed issues on win32 and mac keyboard
ios and mac projects unified in one simple xcode project

Not finished yet:
 - iOS only includes Test Cpp (Simple Game not working yet on iOS)

It is easier to maintain and add more targets, files, etc.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
issue #2244:Add some constructor
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into windows_keyboard_support
KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT
issue #2359: Using PositionColor shader when texture is NULL in Sprite.
TODO: PostionTextureColor shader should support empty texture.
Merge pull request #3067 from dumganhar/develop

Using PositionColor shader when texture is NULL in Sprite.
fix CCScale9Sprite for rotated sprite frame

fix Issue #1145
Merge branch 'develop' into ios_mac_one_project
SimpleGame and HelloCpp works as expected

their Info.plist was broken