fix bugs in CCDictionary & platform/win32/CCImage.cpp::setFont, according to BitWave's codereview.
fix bugs in CCDictionary::objectForKey(int/string)
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20

Conflicts:
	cocos2dx/cocoa/CCDictionary.cpp
	cocos2dx/platform/win32/CCImage.cpp
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Added EditBox implementation for Mac OSX.
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
issue #1640: Updated js files for jsbindings
Updated the submodule reference of cocos2d-js-tests.
issue #1640: Updated jsbinding for CCPhysicsSprite .
issue #1640: Added some files to iOS Project.