Added EditBox implementation for Mac OSX.
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
issue #1646: Updated spiderMonkey to FF18.0.
issue #1646: Using GNU libstdc++ to build spiderMonkey on Android.
issue #1646: Updated WatermelonWithme project setting for win32.
issue #1646: GCC_OPTIMIZATION_LEVEL=1.
fixed #1646: GCC_OPTIMIZATION=1 for every jsb project setting of debug mode. This can avoid 'vm_protect' error when debugging jsb project on device.
Merge pull request #1826 from dumganhar/iss-1646-spidermonkey18

fixed #1646: Updated spiderMonkey to FF18.0.
Added EditBox implementation for Mac OSX.
Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into gles20
Fixed and refactored Mac Implementation.
Merge pull request #1817 from jpridavok/gles20

fixed #1635: Added EditBox implementation for Mac OSX.
Update AUTHORS
fix a typo.
Merge pull request #1828 from dumganhar/gles20

fixed a typo.
Updated the submodule of cocos2d-js-tests.
Merge pull request #1830 from dumganhar/update-js-tests

Updated the submodule of cocos2d-js-tests.