added windows keyboard support
closed #2349, Add user login/logout plugin UC.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
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 windows_keyboard_support
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT
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
Adds JS tests for iOS
Obfuscated Test JS added on iOS and Mac

new version of game.js. I guess it was autogenerated
Adds const to getters

Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
Adds more const in getters

In Sprite and Texture2D
setTexParams() is passed as a const reference

All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
Merge pull request #3047 from natural-law/develop

Add user login/logout plugin UC.