Encoding UTF-8 on Tizen CCEditBox and check empty string.
Keep a previous text on Tizen CCEditBox.
Delete ByteBuffer pointer and NULL check.
Implement setIMEKeyboardState function for Tizen.
Modify space character check.
CCConfiguration supports default values in the query

Adds tests for the new API as well
uses the cocos2d.x namespace for "cocos2d x" configuration values
Merge pull request #2685 from ricardoquesada/configuration_default_values

CCConfiguration supports default values in the query
Merge branch 'tizen_2.1' of https://github.com/pyrasis/cocos2d-x
Merge pull request #2701 from dumganhar/master

Merge some changes of tizen from develop branch.
Spidermonkey for Android/x86
Merge pull request #2702 from dumganhar/master

Spidermonkey for Android/x86
Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console.
Adding submodule of cocos2d-console to 'tools' folder.
Merge pull request #2705 from dumganhar/master

Moving JS bytecode generated tool (jsbcc) from 'tools/jsbcc' to 'cocos2d-console'.
fixed #1647: Adding WebSocket support for Cpp and JSB.

Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
fixed #1647: Adding missing files.
fixed #1647: Updating JS-test.
issue # 1647: Fix include, 'Websocket.h' -> 'WebSocket.h' since linux is case sensitive.
WS_ERROR -> ERROR, WS_STATE -> STATE.