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
TableView updates to provide more touch input to CCTableViewDelegate
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
added lua support for linux platform
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
when user specified 'group' parameter, it should be parsed as an 'int'

Otherwise, when we do slicing, it would report type error.
added support for Japanese language
add kLanguageKorean and kLanguageJapanese for lua binding
implemented CCApplication::getCurrentLanguage() for linux platform
Fix for CCRenderTexture on Android sleep/resume

When an android app goes into the background, all gl context is lost, including any frame buffer objects that are required for rendering to a texture. When the android app returns to focus, a new FBO is generated for each render texture allowing rendering to the texture to continue.