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
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
Setting Windows app title for non-Debug mode, also.
Detect VS2012 Update 1
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20